From 2d45f6100b4e2d99a870f677a53faf351f713926 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 6 Jul 2022 15:15:52 -0700 Subject: [PATCH 01/11] drop 3.6 --- sdk/core/azure-core/CHANGELOG.md | 4 +++- sdk/core/azure-core/azure/core/_version.py | 2 +- sdk/core/azure-core/setup.py | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index d213c6e69615..4368f7c22ce9 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -1,6 +1,8 @@ # Release History -## 1.24.3 (Unreleased) +## 1.25.0 (Unreleased) + +Azure-core is supported on Python 3.7 or later. For more details, please read our page on [Azure SDK for Python version support policy](https://github.com/Azure/azure-sdk-for-python/wiki/Azure-SDKs-Python-version-support-policy). ### Features Added diff --git a/sdk/core/azure-core/azure/core/_version.py b/sdk/core/azure-core/azure/core/_version.py index 5d5f59654149..af2d4f265eb3 100644 --- a/sdk/core/azure-core/azure/core/_version.py +++ b/sdk/core/azure-core/azure/core/_version.py @@ -9,4 +9,4 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "1.24.3" +VERSION = "1.25.0" diff --git a/sdk/core/azure-core/setup.py b/sdk/core/azure-core/setup.py index 4d5f5fdd2805..df5ca6ac27ef 100644 --- a/sdk/core/azure-core/setup.py +++ b/sdk/core/azure-core/setup.py @@ -49,7 +49,6 @@ 'Programming Language :: Python', "Programming Language :: Python :: 3 :: Only", 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', @@ -65,7 +64,7 @@ package_data={ 'pytyped': ['py.typed'], }, - python_requires=">=3.6", + python_requires=">=3.7", install_requires=[ 'requests>=2.18.4', 'six>=1.11.0', From be334e129a4f6bf6aaf8d57c1ee238791b8238aa Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 6 Jul 2022 15:40:05 -0700 Subject: [PATCH 02/11] update --- eng/pipelines/templates/stages/platform-matrix.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 7b9f0e21cda9..b3aadb177ed0 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -10,7 +10,7 @@ "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }, "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" } }, - "PythonVersion": [ "pypy3.7", "3.6", "3.7", "3.8" ], + "PythonVersion": [ "pypy3.7", "3.7", "3.8" ], "CoverageArg": "--disablecov", "TestSamples": "false" }, From bf07db80ddba69410acd5dc3191a3e785fc71949 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 6 Jul 2022 16:26:34 -0700 Subject: [PATCH 03/11] update --- .../templates/stages/platform-matrix-conda-support.json | 2 +- .../stages/platform-matrix-cryptography-dependency.json | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix-conda-support.json b/eng/pipelines/templates/stages/platform-matrix-conda-support.json index bbca13e4e15a..ca2b7300251d 100644 --- a/eng/pipelines/templates/stages/platform-matrix-conda-support.json +++ b/eng/pipelines/templates/stages/platform-matrix-conda-support.json @@ -3,6 +3,6 @@ "Agent": { "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" } }, - "PythonVersion": [ "3.6" ] + "PythonVersion": [ "3.9" ] } } diff --git a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json index 9d309a370e7c..429ad861a11e 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json +++ b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json @@ -28,13 +28,6 @@ }, "PythonVersion": "3.7", "CoverageArg": "--disablecov" - }, - { - "Agent": { - "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } - }, - "PythonVersion": "3.6", - "CoverageArg": "--disablecov" } ] } From 99cc592ab0d30bd1ca881db1e9d38a8a3a499dcf Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 12 Jul 2022 12:12:20 -0700 Subject: [PATCH 04/11] remove 3.6 from two additional platform matrixes. --- .../phonenumbers-livetest-matrix.json | 2 +- sdk/storage/platform-matrix-all-versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json b/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json index 067cd921f597..da3f760ea4cb 100644 --- a/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json +++ b/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json @@ -24,7 +24,7 @@ "COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "false" } }, - "PythonVersion": ["pypy3.7", "3.6", "3.7", "3.8"], + "PythonVersion": ["pypy3.7", "3.7", "3.8"], "CoverageArg": "--disablecov", "TestSamples": "false" }, diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json index 02201b8ee218..cd6c3e8af40b 100644 --- a/sdk/storage/platform-matrix-all-versions.json +++ b/sdk/storage/platform-matrix-all-versions.json @@ -10,7 +10,7 @@ "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }, "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" } }, - "PythonVersion": [ "pypy3.7", "3.6", "3.7", "3.8", "3.9" ], + "PythonVersion": [ "pypy3.7", "3.7", "3.8", "3.9" ], "CoverageArg": "--disablecov", "TestSamples": "false", "AZURE_LIVE_TEST_SERVICE_VERSION": [ From a710e8c52ca1b2b0f4e3b3b75b1fa2820f974724 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 12 Jul 2022 12:19:22 -0700 Subject: [PATCH 05/11] Update platform-matrix-cryptography-dependency.json --- .../stages/platform-matrix-cryptography-dependency.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json index 429ad861a11e..f4632e2aa756 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json +++ b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json @@ -7,7 +7,7 @@ "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" } }, - "PythonVersion": [ "pypy3.7", "3.8", "3.9" ], + "PythonVersion": [ "pypy3.7", "3.8", "3.10" ], "CoverageArg": "--disablecov" }, "include": [ @@ -28,6 +28,13 @@ }, "PythonVersion": "3.7", "CoverageArg": "--disablecov" + }, + { + "Agent": { + "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } + }, + "PythonVersion": "3.9", + "CoverageArg": "--disablecov" } ] } From d979ae220e038b2554a7539a3b423274d9268941 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 12 Jul 2022 12:32:46 -0700 Subject: [PATCH 06/11] Update platform-matrix-cryptography-dependency.json --- .../stages/platform-matrix-cryptography-dependency.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json index f4632e2aa756..ee94f3bdeb9b 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json +++ b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json @@ -7,7 +7,7 @@ "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" } }, - "PythonVersion": [ "pypy3.7", "3.8", "3.10" ], + "PythonVersion": [ "pypy3.7", "3.8"], "CoverageArg": "--disablecov" }, "include": [ From 85afd75dba8f648ecacb906713df3b0e27ee428f Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 12 Jul 2022 13:45:45 -0700 Subject: [PATCH 07/11] try resolving activation failure --- eng/conda_test_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/conda_test_requirements.txt b/eng/conda_test_requirements.txt index f393029ad4e3..27e1194f9c4d 100644 --- a/eng/conda_test_requirements.txt +++ b/eng/conda_test_requirements.txt @@ -10,4 +10,5 @@ typing_extensions>=3.7.2 futures==3.3.0; python_version <= '2.7' cryptography adal +setuptools==46.4.0 -e sdk/core/azure-core/tests/testserver_tests/coretestserver From 868c7681a1edc7a8735f95c4428558468a93cc88 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 12 Jul 2022 13:51:34 -0700 Subject: [PATCH 08/11] disable generation of docs and BOM. don't want to wait forever for this build --- .../templates/steps/build-artifacts.yml | 58 +++++++++---------- .../templates/steps/build-conda-artifacts.yml | 18 +++--- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/eng/pipelines/templates/steps/build-artifacts.yml b/eng/pipelines/templates/steps/build-artifacts.yml index 6a65da2d078f..02f47e607003 100644 --- a/eng/pipelines/templates/steps/build-artifacts.yml +++ b/eng/pipelines/templates/steps/build-artifacts.yml @@ -70,19 +70,19 @@ steps: twine check $(Build.ArtifactStagingDirectory)/**/*.zip displayName: 'Verify Readme' - - task: PythonScript@0 - displayName: 'Generate Docs' - condition: and(succeededOrFailed(), ${{parameters.BuildDocs}}) - inputs: - scriptPath: 'scripts/devops_tasks/setup_execute_tests.py' - arguments: >- - "$(TargetingString)" - --service="${{ parameters.ServiceDirectory }}" - --toxenv=sphinx - - - template: /eng/pipelines/templates/steps/run_apistub.yml - parameters: - ServiceDirectory: ${{ parameters.ServiceDirectory }} + # - task: PythonScript@0 + # displayName: 'Generate Docs' + # condition: and(succeededOrFailed(), ${{parameters.BuildDocs}}) + # inputs: + # scriptPath: 'scripts/devops_tasks/setup_execute_tests.py' + # arguments: >- + # "$(TargetingString)" + # --service="${{ parameters.ServiceDirectory }}" + # --toxenv=sphinx + + # - template: /eng/pipelines/templates/steps/run_apistub.yml + # parameters: + # ServiceDirectory: ${{ parameters.ServiceDirectory }} - ${{ parameters.BeforePublishSteps }} @@ -91,20 +91,20 @@ steps: ArtifactPath: '$(Build.ArtifactStagingDirectory)' ArtifactName: 'packages' - - template: /eng/common/pipelines/templates/steps/publish-artifact.yml - parameters: - ArtifactPath: '$(Build.SourcesDirectory)/_docs' - CustomCondition: ${{ parameters.BuildDocs }} - ArtifactName: 'documentation' - - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 'Generate BOM' - condition: succeededOrFailed() - inputs: - BuildDropPath: $(Build.ArtifactStagingDirectory) - - - template: /eng/common/pipelines/templates/steps/publish-artifact.yml - parameters: - ArtifactPath: '$(Build.ArtifactStagingDirectory)/_manifest' - ArtifactName: 'manifest' + # - template: /eng/common/pipelines/templates/steps/publish-artifact.yml + # parameters: + # ArtifactPath: '$(Build.SourcesDirectory)/_docs' + # CustomCondition: ${{ parameters.BuildDocs }} + # ArtifactName: 'documentation' + + # - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + # displayName: 'Generate BOM' + # condition: succeededOrFailed() + # inputs: + # BuildDropPath: $(Build.ArtifactStagingDirectory) + + # - template: /eng/common/pipelines/templates/steps/publish-artifact.yml + # parameters: + # ArtifactPath: '$(Build.ArtifactStagingDirectory)/_manifest' + # ArtifactName: 'manifest' diff --git a/eng/pipelines/templates/steps/build-conda-artifacts.yml b/eng/pipelines/templates/steps/build-conda-artifacts.yml index 3f5fe5198735..7033904c7ae5 100644 --- a/eng/pipelines/templates/steps/build-conda-artifacts.yml +++ b/eng/pipelines/templates/steps/build-conda-artifacts.yml @@ -84,13 +84,13 @@ steps: ArtifactPath: '$(Agent.BuildDirectory)/conda/output' ArtifactName: 'conda' - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 'Upload Conda Package SBOM' - condition: succeededOrFailed() - inputs: - BuildDropPath: '$(Agent.BuildDirectory)/conda/manifest' + # - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + # displayName: 'Upload Conda Package SBOM' + # condition: succeededOrFailed() + # inputs: + # BuildDropPath: '$(Agent.BuildDirectory)/conda/manifest' - - template: /eng/common/pipelines/templates/steps/publish-artifact.yml - parameters: - ArtifactPath: '$(Agent.BuildDirectory)/conda/manifest/_manifest' - ArtifactName: 'conda_manifest' \ No newline at end of file + # - template: /eng/common/pipelines/templates/steps/publish-artifact.yml + # parameters: + # ArtifactPath: '$(Agent.BuildDirectory)/conda/manifest/_manifest' + # ArtifactName: 'conda_manifest' \ No newline at end of file From 7750ac9f27335f35e9fb8a3a9ab55e5f1b952daa Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 12 Jul 2022 15:14:11 -0700 Subject: [PATCH 09/11] align pytest asyncio version --- eng/conda_test_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/conda_test_requirements.txt b/eng/conda_test_requirements.txt index 27e1194f9c4d..30e138c2351b 100644 --- a/eng/conda_test_requirements.txt +++ b/eng/conda_test_requirements.txt @@ -11,4 +11,5 @@ futures==3.3.0; python_version <= '2.7' cryptography adal setuptools==46.4.0 +pytest-asyncio==0.12.0; python_version >= '3.5' -e sdk/core/azure-core/tests/testserver_tests/coretestserver From 4fb3f96b75a0d12a44abea5056ef0f2e5e6d605b Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 12 Jul 2022 15:26:44 -0700 Subject: [PATCH 10/11] restore artifact build to original. we don't need to skip stuff and save time anymore --- .../templates/steps/build-artifacts.yml | 58 +++++++++---------- .../templates/steps/build-conda-artifacts.yml | 18 +++--- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/eng/pipelines/templates/steps/build-artifacts.yml b/eng/pipelines/templates/steps/build-artifacts.yml index 02f47e607003..6a65da2d078f 100644 --- a/eng/pipelines/templates/steps/build-artifacts.yml +++ b/eng/pipelines/templates/steps/build-artifacts.yml @@ -70,19 +70,19 @@ steps: twine check $(Build.ArtifactStagingDirectory)/**/*.zip displayName: 'Verify Readme' - # - task: PythonScript@0 - # displayName: 'Generate Docs' - # condition: and(succeededOrFailed(), ${{parameters.BuildDocs}}) - # inputs: - # scriptPath: 'scripts/devops_tasks/setup_execute_tests.py' - # arguments: >- - # "$(TargetingString)" - # --service="${{ parameters.ServiceDirectory }}" - # --toxenv=sphinx - - # - template: /eng/pipelines/templates/steps/run_apistub.yml - # parameters: - # ServiceDirectory: ${{ parameters.ServiceDirectory }} + - task: PythonScript@0 + displayName: 'Generate Docs' + condition: and(succeededOrFailed(), ${{parameters.BuildDocs}}) + inputs: + scriptPath: 'scripts/devops_tasks/setup_execute_tests.py' + arguments: >- + "$(TargetingString)" + --service="${{ parameters.ServiceDirectory }}" + --toxenv=sphinx + + - template: /eng/pipelines/templates/steps/run_apistub.yml + parameters: + ServiceDirectory: ${{ parameters.ServiceDirectory }} - ${{ parameters.BeforePublishSteps }} @@ -91,20 +91,20 @@ steps: ArtifactPath: '$(Build.ArtifactStagingDirectory)' ArtifactName: 'packages' - # - template: /eng/common/pipelines/templates/steps/publish-artifact.yml - # parameters: - # ArtifactPath: '$(Build.SourcesDirectory)/_docs' - # CustomCondition: ${{ parameters.BuildDocs }} - # ArtifactName: 'documentation' - - # - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - # displayName: 'Generate BOM' - # condition: succeededOrFailed() - # inputs: - # BuildDropPath: $(Build.ArtifactStagingDirectory) - - # - template: /eng/common/pipelines/templates/steps/publish-artifact.yml - # parameters: - # ArtifactPath: '$(Build.ArtifactStagingDirectory)/_manifest' - # ArtifactName: 'manifest' + - template: /eng/common/pipelines/templates/steps/publish-artifact.yml + parameters: + ArtifactPath: '$(Build.SourcesDirectory)/_docs' + CustomCondition: ${{ parameters.BuildDocs }} + ArtifactName: 'documentation' + + - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate BOM' + condition: succeededOrFailed() + inputs: + BuildDropPath: $(Build.ArtifactStagingDirectory) + + - template: /eng/common/pipelines/templates/steps/publish-artifact.yml + parameters: + ArtifactPath: '$(Build.ArtifactStagingDirectory)/_manifest' + ArtifactName: 'manifest' diff --git a/eng/pipelines/templates/steps/build-conda-artifacts.yml b/eng/pipelines/templates/steps/build-conda-artifacts.yml index 7033904c7ae5..3f5fe5198735 100644 --- a/eng/pipelines/templates/steps/build-conda-artifacts.yml +++ b/eng/pipelines/templates/steps/build-conda-artifacts.yml @@ -84,13 +84,13 @@ steps: ArtifactPath: '$(Agent.BuildDirectory)/conda/output' ArtifactName: 'conda' - # - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - # displayName: 'Upload Conda Package SBOM' - # condition: succeededOrFailed() - # inputs: - # BuildDropPath: '$(Agent.BuildDirectory)/conda/manifest' + - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Upload Conda Package SBOM' + condition: succeededOrFailed() + inputs: + BuildDropPath: '$(Agent.BuildDirectory)/conda/manifest' - # - template: /eng/common/pipelines/templates/steps/publish-artifact.yml - # parameters: - # ArtifactPath: '$(Agent.BuildDirectory)/conda/manifest/_manifest' - # ArtifactName: 'conda_manifest' \ No newline at end of file + - template: /eng/common/pipelines/templates/steps/publish-artifact.yml + parameters: + ArtifactPath: '$(Agent.BuildDirectory)/conda/manifest/_manifest' + ArtifactName: 'conda_manifest' \ No newline at end of file From 9d6b37fbc1dff4a87badee316c92c917e5272fdb Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 12 Jul 2022 15:31:44 -0700 Subject: [PATCH 11/11] remove pyversion restriction in conda_test_requirements.txt --- eng/conda_test_requirements.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/eng/conda_test_requirements.txt b/eng/conda_test_requirements.txt index 30e138c2351b..45c8aeea6380 100644 --- a/eng/conda_test_requirements.txt +++ b/eng/conda_test_requirements.txt @@ -1,15 +1,14 @@ # install from root of repo -aiohttp>=3.0; python_version >= '3.5' +aiohttp>=3.0 tools/azure-devtools tools/azure-sdk-tools mock; -aiodns>=2.0; python_version >= '3.5' -parameterized>=0.7.3; python_version >= '3.0' -trio; python_version >= '3.5' +aiodns>=2.0 +parameterized>=0.7.3 +trio typing_extensions>=3.7.2 -futures==3.3.0; python_version <= '2.7' cryptography adal setuptools==46.4.0 -pytest-asyncio==0.12.0; python_version >= '3.5' +pytest-asyncio==0.12.0 -e sdk/core/azure-core/tests/testserver_tests/coretestserver