Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 39 additions & 50 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,56 +6,33 @@ trigger:
include:
- '*'
jobs:
- job: Tox36
displayName: 'Tox: Python 3.6'
- job: Tox
condition: succeeded()
pool:
vmImage: 'ubuntu-16.04'
steps:
- task: UsePythonVersion@0
displayName: 'Use Python 3.6'
inputs:
versionSpec: 3.6
- task: Bash@3
displayName: 'Run Tox'
env:
TOXENV: py36
inputs:
targetType: 'filePath'
filePath: scripts/ci/run_tox.sh

- job: Tox37
displayName: 'Tox: Python 3.7'
condition: succeeded()
pool:
vmImage: 'ubuntu-16.04'
steps:
- task: UsePythonVersion@0
displayName: 'Use Python 3.7'
inputs:
versionSpec: 3.7
- task: Bash@3
displayName: 'Run Tox'
env:
TOXENV: py37
inputs:
targetType: 'filePath'
filePath: scripts/ci/run_tox.sh

- job: Tox38
displayName: 'Tox: Python 3.8'
condition: succeeded()
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
strategy:
matrix:
Python36:
python.version: '3.6'
tox_env: 'py36'
Python37:
python.version: '3.7'
tox_env: 'py37'
Python38:
python.version: '3.8'
tox_env: 'py38'
Python39:
python.version: '3.9'
tox_env: 'py39'
Comment on lines +14 to +26
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using matrix to avoid duplicated code.

steps:
- task: UsePythonVersion@0
displayName: 'Use Python 3.8'
displayName: 'Use Python $(python.version)'
inputs:
versionSpec: 3.8
versionSpec: '$(python.version)'
- task: Bash@3
displayName: 'Run Tox'
env:
TOXENV: py38
TOXENV: $(tox_env)
inputs:
targetType: 'filePath'
filePath: scripts/ci/run_tox.sh
Expand All @@ -64,7 +41,7 @@ jobs:
displayName: 'Extract Metadata'
condition: succeeded()
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also update to use newer ubuntu-18.04.

steps:
- task: Bash@3
displayName: 'Extract Version'
Expand All @@ -84,7 +61,7 @@ jobs:
dependsOn: ExtractMetadata
condition: succeeded()
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
steps:
- task: UsePythonVersion@0
displayName: 'Use Python 3.7'
Expand All @@ -107,11 +84,13 @@ jobs:
timeoutInMinutes: 10

pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
strategy:
matrix:
Python36:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
steps:
Expand Down Expand Up @@ -152,10 +131,12 @@ jobs:
dependsOn: BuildPythonWheel
condition: succeeded()
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
strategy:
matrix:
Python36:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
Expand Down Expand Up @@ -184,10 +165,12 @@ jobs:
dependsOn: BuildPythonWheel
condition: succeeded()
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
strategy:
matrix:
Python36:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
Expand Down Expand Up @@ -216,10 +199,12 @@ jobs:
dependsOn: BuildPythonWheel
condition: succeeded()
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
strategy:
matrix:
Python36:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
Expand Down Expand Up @@ -248,10 +233,12 @@ jobs:
dependsOn: BuildPythonWheel
condition: succeeded()
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
strategy:
matrix:
Python36:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
Expand Down Expand Up @@ -279,11 +266,13 @@ jobs:
displayName: "Performance Check on Linux"
dependsOn: BuildPythonWheel
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
strategy:
matrix:
Python36:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
steps:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
'Programming Language :: Python :: 3.8'
],
keywords='azure',
python_requires='>=3.6,<=3.9',
python_requires='>=3.6',
packages=[
'azdev',
'azdev.config',
Expand Down