From 970d8c6952628fe523698feb87024eddd6e5c180 Mon Sep 17 00:00:00 2001 From: Jiashuo Li Date: Mon, 25 Jan 2021 17:08:39 +0800 Subject: [PATCH 1/2] Tox py39 --- azure-pipelines.yml | 101 ++++++++++++++++++++++---------------------- setup.py | 2 +- 2 files changed, 52 insertions(+), 51 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33877a5b..e4f4447a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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' 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 @@ -64,7 +41,7 @@ jobs: displayName: 'Extract Metadata' condition: succeeded() pool: - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-18.04' steps: - task: Bash@3 displayName: 'Extract Version' @@ -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' @@ -107,13 +84,17 @@ 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' + Python39: + python.version: '3.9' steps: - task: UsePythonVersion@0 displayName: 'Use Python $(python.version)' @@ -152,13 +133,17 @@ 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' + Python39: + python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build' @@ -184,13 +169,17 @@ 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' + Python39: + python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build' @@ -216,13 +205,17 @@ 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' + Python39: + python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build' @@ -248,13 +241,17 @@ 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' + Python39: + python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build' @@ -279,13 +276,17 @@ 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' + Python39: + python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build' diff --git a/setup.py b/setup.py index 3c5bdeca..f078c8e0 100644 --- a/setup.py +++ b/setup.py @@ -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', From 451c9d612aa1c08bd7462a80a1d3b7cf699f5cc4 Mon Sep 17 00:00:00 2001 From: Jiashuo Li Date: Mon, 25 Jan 2021 17:21:56 +0800 Subject: [PATCH 2/2] revert 3.9 --- azure-pipelines.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e4f4447a..ab0e3e27 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -93,8 +93,6 @@ jobs: python.version: '3.7' Python38: python.version: '3.8' - Python39: - python.version: '3.9' steps: - task: UsePythonVersion@0 displayName: 'Use Python $(python.version)' @@ -142,8 +140,6 @@ jobs: python.version: '3.7' Python38: python.version: '3.8' - Python39: - python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build' @@ -178,8 +174,6 @@ jobs: python.version: '3.7' Python38: python.version: '3.8' - Python39: - python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build' @@ -214,8 +208,6 @@ jobs: python.version: '3.7' Python38: python.version: '3.8' - Python39: - python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build' @@ -250,8 +242,6 @@ jobs: python.version: '3.7' Python38: python.version: '3.8' - Python39: - python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build' @@ -285,8 +275,6 @@ jobs: python.version: '3.7' Python38: python.version: '3.8' - Python39: - python.version: '3.9' steps: - task: DownloadPipelineArtifact@1 displayName: 'Download Build'