diff options
| author | Bernat Gabor <bgabor8@bloomberg.net> | 2019-04-15 11:05:23 +0100 |
|---|---|---|
| committer | Bernát Gábor <gaborjbernat@gmail.com> | 2019-04-16 20:20:02 +0100 |
| commit | 3efa0caafd0ee21378e71584f0bbfe6dfa94eb4f (patch) | |
| tree | 0a86125f4674b2ae5cb364a6c05b27b59ac48d67 | |
| parent | 4c3a891a40642854dac0b97947df47a21391b0c7 (diff) | |
| download | tox-git-3efa0caafd0ee21378e71584f0bbfe6dfa94eb4f.tar.gz | |
move to latest images
| -rw-r--r-- | azure-pipelines.yml | 8 | ||||
| -rw-r--r-- | azure-run-tox-env.yml | 6 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b7b25c85..7bde22e1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,6 +8,7 @@ variables: PYTEST_ADDOPTS: "-v -v -ra --showlocals" GIT_BRANCH: $[ coalesce(variables['System.PullRequest.SourceBranch'], variables['Build.SourceBranchName'], 'not-found') ] GIT_COMMIT_SHA: $[ coalesce(variables['System.PullRequest.SourceCommitId'], variables['Build.SourceVersion'], 'not-found') ] + PYTEST_XDIST_PROC_NR: 'auto' trigger: batch: true @@ -73,7 +74,9 @@ jobs: parameters: {tox: py27, python: 2.7, os: linux} - template: azure-run-tox-env.yml - parameters: {tox: py36, python: 3.6, os: macOs} + parameters: {tox: py37, python: 3.7, os: macOs} +- template: azure-run-tox-env.yml + parameters: {tox: py27, python: 2.7, os: macOs} - job: report_coverage pool: {vmImage: 'Ubuntu 16.04'} @@ -91,7 +94,8 @@ jobs: - linux_py27 - linux_pypy3 - linux_pypy - - macOS_py36 + - macOS_py37 + - macOS_py27 steps: - task: DownloadBuildArtifacts@0 displayName: download coverage files for run diff --git a/azure-run-tox-env.yml b/azure-run-tox-env.yml index a75feea7..f18e192d 100644 --- a/azure-run-tox-env.yml +++ b/azure-run-tox-env.yml @@ -8,11 +8,11 @@ jobs: dependsOn: notify_build_start pool: ${{ if eq(parameters.os, 'windows') }}: - vmImage: "vs2017-win2016" + vmImage: "windows-2019" ${{ if eq(parameters.os, 'macOs') }}: - vmImage: "macOS 10.13" + vmImage: "macOS-latest" ${{ if eq(parameters.os, 'linux') }}: - vmImage: "Ubuntu 16.04" + vmImage: "Ubuntu-16.04" variables: TMPDIR: $(Build.BinariesDirectory) @@ -18,7 +18,7 @@ skip_missing_interpreters = true description = run the tests with pytest under {basepython} setenv = PIP_DISABLE_VERSION_CHECK = 1 COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}} -passenv = http_proxy https_proxy no_proxy SSL_CERT_FILE PYTEST_ADDOPTS +passenv = http_proxy https_proxy no_proxy SSL_CERT_FILE PYTEST_* deps = extras = testing commands = pytest \ |