diff options
Diffstat (limited to '.azure-pipelines')
| -rw-r--r-- | .azure-pipelines/jobs/test-windows.yml | 19 | ||||
| -rw-r--r-- | .azure-pipelines/macos.yml | 4 | ||||
| -rw-r--r-- | .azure-pipelines/steps/run-tests-windows.yml | 8 | ||||
| -rw-r--r-- | .azure-pipelines/steps/run-tests.yml | 2 |
4 files changed, 26 insertions, 7 deletions
diff --git a/.azure-pipelines/jobs/test-windows.yml b/.azure-pipelines/jobs/test-windows.yml index 3d25587de..1a933a693 100644 --- a/.azure-pipelines/jobs/test-windows.yml +++ b/.azure-pipelines/jobs/test-windows.yml @@ -12,18 +12,30 @@ jobs: Python27-x86: python.version: '2.7' python.architecture: x86 + Python27-x64: + python.version: '2.7' + python.architecture: x64 + useVenv: true Python35-x64: python.version: '3.5' python.architecture: x64 + Python36-x64: + python.version: '3.6' + python.architecture: x64 + useVenv: true Python37-x64: python.version: '3.7' python.architecture: x64 - maxParallel: 3 + Python38-x64: + python.version: '3.8' + python.architecture: x64 + maxParallel: 6 steps: - template: ../steps/run-tests-windows.yml parameters: runIntegrationTests: true + useVenv: '$(useVenv)' - job: Test_Secondary displayName: Test Secondary @@ -45,7 +57,10 @@ jobs: Python37-x86: python.version: '3.7' python.architecture: x86 - maxParallel: 5 + Python38-x86: + python.version: '3.8' + python.architecture: x86 + maxParallel: 6 steps: - template: ../steps/run-tests-windows.yml diff --git a/.azure-pipelines/macos.yml b/.azure-pipelines/macos.yml index 7408a3884..85c2a0246 100644 --- a/.azure-pipelines/macos.yml +++ b/.azure-pipelines/macos.yml @@ -1,8 +1,8 @@ jobs: - template: jobs/test.yml parameters: - vmImage: xcode9-macos10.13 + vmImage: macos-10.14 - template: jobs/package.yml parameters: - vmImage: xcode9-macos10.13 + vmImage: macos-10.14 diff --git a/.azure-pipelines/steps/run-tests-windows.yml b/.azure-pipelines/steps/run-tests-windows.yml index 9926754b0..3832e4662 100644 --- a/.azure-pipelines/steps/run-tests-windows.yml +++ b/.azure-pipelines/steps/run-tests-windows.yml @@ -1,5 +1,6 @@ parameters: runIntegrationTests: + useVenv: false steps: - task: UsePythonVersion@0 @@ -24,7 +25,7 @@ steps: Set-Acl "R:\Temp" $acl displayName: Set RAMDisk Permissions -- bash: pip install --upgrade setuptools tox +- bash: pip install --upgrade 'virtualenv<20' setuptools tox displayName: Install Tox - script: tox -e py -- -m unit -n auto --junit-xml=junit/unit-test.xml @@ -43,8 +44,11 @@ steps: # https://bugs.python.org/issue18199 $env:TEMP = "R:\Temp" - tox -e py -- -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml + tox -e py -- $env:USE_VENV_ARG -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml displayName: Tox run integration tests + env: + ${{ if eq(parameters.useVenv, 'true') }}: + USE_VENV_ARG: "--use-venv" - task: PublishTestResults@2 displayName: Publish Test Results diff --git a/.azure-pipelines/steps/run-tests.yml b/.azure-pipelines/steps/run-tests.yml index 64163a5be..11ea22727 100644 --- a/.azure-pipelines/steps/run-tests.yml +++ b/.azure-pipelines/steps/run-tests.yml @@ -4,7 +4,7 @@ steps: inputs: versionSpec: '$(python.version)' -- bash: pip install --upgrade setuptools tox +- bash: pip install --upgrade 'virtualenv<20' setuptools tox displayName: Install Tox - script: tox -e py -- -m unit -n auto --junit-xml=junit/unit-test.xml |