From 2283f1fe091323e2d6bc9852f5c6df1ffcb47413 Mon Sep 17 00:00:00 2001 From: Bavneet Singh Date: Tue, 9 Aug 2022 19:35:58 -0700 Subject: [PATCH 1/4] CI fix:use new python version that is supported --- testing/pipeline/k8s-custom-pipelines.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/testing/pipeline/k8s-custom-pipelines.yml b/testing/pipeline/k8s-custom-pipelines.yml index 3e0ce17a3c1..e58ac6d534e 100644 --- a/testing/pipeline/k8s-custom-pipelines.yml +++ b/testing/pipeline/k8s-custom-pipelines.yml @@ -72,9 +72,9 @@ stages: vmImage: 'ubuntu-latest' steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.6' + displayName: 'Use Python 3.10' inputs: - versionSpec: 3.6 + versionSpec: 3.10 - bash: | set -ev @@ -117,9 +117,9 @@ stages: vmImage: 'ubuntu-latest' steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.7' + displayName: 'Use Python 3.10' inputs: - versionSpec: 3.7 + versionSpec: 3.10 - bash: | #!/usr/bin/env bash set -ev @@ -138,6 +138,10 @@ stages: python.version: '3.6' Python38: python.version: '3.8' + Python39: + python.version: '3.9' + Python310: + python.version: '3.10' steps: - task: UsePythonVersion@0 displayName: 'Use Python $(python.version)' @@ -171,9 +175,9 @@ stages: vmImage: 'ubuntu-latest' steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.6' + displayName: 'Use Python 3.10' inputs: - versionSpec: 3.6 + versionSpec: 3.10 - bash: | set -ev From c4d8d88d899c8c67c14e13c426d45b977cb3b34a Mon Sep 17 00:00:00 2001 From: Bavneet Singh Date: Tue, 9 Aug 2022 19:40:41 -0700 Subject: [PATCH 2/4] remove python 3.6 as it is not supported --- testing/pipeline/k8s-custom-pipelines.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/testing/pipeline/k8s-custom-pipelines.yml b/testing/pipeline/k8s-custom-pipelines.yml index e58ac6d534e..0592b58ec53 100644 --- a/testing/pipeline/k8s-custom-pipelines.yml +++ b/testing/pipeline/k8s-custom-pipelines.yml @@ -134,8 +134,6 @@ stages: vmImage: 'ubuntu-latest' strategy: matrix: - Python36: - python.version: '3.6' Python38: python.version: '3.8' Python39: From 669b80ad278a38bfa3622e8bd3e2ff5bc36e3a5c Mon Sep 17 00:00:00 2001 From: Bavneet Singh Date: Tue, 9 Aug 2022 20:17:37 -0700 Subject: [PATCH 3/4] upgrade python version for extension and static analysis --- testing/pipeline/k8s-custom-pipelines.yml | 4 ++-- testing/pipeline/templates/build-extension.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/pipeline/k8s-custom-pipelines.yml b/testing/pipeline/k8s-custom-pipelines.yml index 0592b58ec53..76dbf2a4751 100644 --- a/testing/pipeline/k8s-custom-pipelines.yml +++ b/testing/pipeline/k8s-custom-pipelines.yml @@ -103,9 +103,9 @@ stages: vmImage: 'ubuntu-latest' steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.6' + displayName: 'Use Python 3.10' inputs: - versionSpec: 3.6 + versionSpec: 3.10 - bash: pip install wheel==0.30.0 pylint==1.9.5 flake8==3.5.0 requests displayName: 'Install wheel, pylint, flake8, requests' - bash: python scripts/ci/source_code_static_analysis.py diff --git a/testing/pipeline/templates/build-extension.yml b/testing/pipeline/templates/build-extension.yml index cf63db635a6..fd65f2028b3 100644 --- a/testing/pipeline/templates/build-extension.yml +++ b/testing/pipeline/templates/build-extension.yml @@ -27,9 +27,9 @@ steps: condition: and(succeeded(), eq(variables['IS_PRIVATE_BRANCH'], 'False')) displayName: "Copy Files, Set Variables for k8s-extension" - task: UsePythonVersion@0 - displayName: 'Use Python 3.6' + displayName: 'Use Python 3.10' inputs: - versionSpec: 3.6 + versionSpec: 3.10 - bash: | set -ev echo "Building extension ${EXTENSION_NAME}..." From c126c5ebae2cca4ebffc06d4adcb7643d3cf1f55 Mon Sep 17 00:00:00 2001 From: Bavneet Singh Date: Tue, 9 Aug 2022 20:24:40 -0700 Subject: [PATCH 4/4] revert python version changes for static analysis and extension tests --- testing/pipeline/k8s-custom-pipelines.yml | 4 ++-- testing/pipeline/templates/build-extension.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/pipeline/k8s-custom-pipelines.yml b/testing/pipeline/k8s-custom-pipelines.yml index 76dbf2a4751..0592b58ec53 100644 --- a/testing/pipeline/k8s-custom-pipelines.yml +++ b/testing/pipeline/k8s-custom-pipelines.yml @@ -103,9 +103,9 @@ stages: vmImage: 'ubuntu-latest' steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.10' + displayName: 'Use Python 3.6' inputs: - versionSpec: 3.10 + versionSpec: 3.6 - bash: pip install wheel==0.30.0 pylint==1.9.5 flake8==3.5.0 requests displayName: 'Install wheel, pylint, flake8, requests' - bash: python scripts/ci/source_code_static_analysis.py diff --git a/testing/pipeline/templates/build-extension.yml b/testing/pipeline/templates/build-extension.yml index fd65f2028b3..cf63db635a6 100644 --- a/testing/pipeline/templates/build-extension.yml +++ b/testing/pipeline/templates/build-extension.yml @@ -27,9 +27,9 @@ steps: condition: and(succeeded(), eq(variables['IS_PRIVATE_BRANCH'], 'False')) displayName: "Copy Files, Set Variables for k8s-extension" - task: UsePythonVersion@0 - displayName: 'Use Python 3.10' + displayName: 'Use Python 3.6' inputs: - versionSpec: 3.10 + versionSpec: 3.6 - bash: | set -ev echo "Building extension ${EXTENSION_NAME}..."