diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index 7e1d570efdd8..c6d82e9509f5 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.21.2 (Unreleased) +## 1.22.0 (Unreleased) ### Features Added @@ -12,6 +12,8 @@ ### Other Changes +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 1.21.1 (2021-12-06) ### Other Changes diff --git a/sdk/core/azure-core/README.md b/sdk/core/azure-core/README.md index 6b3eb96986f5..14b21daf3dfd 100644 --- a/sdk/core/azure-core/README.md +++ b/sdk/core/azure-core/README.md @@ -10,7 +10,7 @@ If you are a client library developer, please reference [client library develope ## _Disclaimer_ -_Azure SDK Python packages support for Python 2.7 is ending 01 January 2022. For more information and questions, please refer to _ +_Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to _ ## Getting started diff --git a/sdk/core/azure-core/azure/core/_version.py b/sdk/core/azure-core/azure/core/_version.py index 94a9dea460cb..5c714d545a88 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.21.2" +VERSION = "1.22.0" diff --git a/sdk/core/azure-core/dev_requirements.txt b/sdk/core/azure-core/dev_requirements.txt index 6297f8880d39..4f9c87a9e464 100644 --- a/sdk/core/azure-core/dev_requirements.txt +++ b/sdk/core/azure-core/dev_requirements.txt @@ -1,10 +1,9 @@ -trio; python_version >= '3.5' -aiohttp>=3.0; python_version >= '3.5' +trio +aiohttp>=3.0 typing_extensions>=3.7.2 opencensus>=0.6.0 opencensus-ext-azure opencensus-ext-threading -mock; python_version < '3.3' -e ../../../tools/azure-sdk-tools -e ../../../tools/azure-devtools -e tests/testserver_tests/coretestserver \ No newline at end of file diff --git a/sdk/core/azure-core/samples/conftest.py b/sdk/core/azure-core/samples/conftest.py deleted file mode 100644 index 6d453aed7c4c..000000000000 --- a/sdk/core/azure-core/samples/conftest.py +++ /dev/null @@ -1,32 +0,0 @@ -# -------------------------------------------------------------------------- -# -# Copyright (c) Microsoft Corporation. All rights reserved. -# -# The MIT License (MIT) -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the ""Software""), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# -# -------------------------------------------------------------------------- -import sys - -# Ignore collection of async tests for Python 2 -collect_ignore = [] -if sys.version_info < (3, 5): - collect_ignore.append("test_example_async.py") - diff --git a/sdk/core/azure-core/setup.cfg b/sdk/core/azure-core/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/core/azure-core/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/core/azure-core/setup.py b/sdk/core/azure-core/setup.py index e401a66a5f94..50c20bca50b2 100644 --- a/sdk/core/azure-core/setup.py +++ b/sdk/core/azure-core/setup.py @@ -47,8 +47,7 @@ classifiers=[ "Development Status :: 5 - Production/Stable", 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', + "Programming Language :: Python :: 3 :: Only", 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', @@ -66,13 +65,9 @@ package_data={ 'pytyped': ['py.typed'], }, + python_requires=">=3.6", install_requires=[ 'requests>=2.18.4', 'six>=1.11.0', ], - extras_require={ - ":python_version<'3.0'": ['azure-nspkg'], - ":python_version<'3.4'": ['enum34>=1.0.4'], - ":python_version<'3.5'": ['typing'], - } ) diff --git a/sdk/core/azure-core/tests/async_tests/conftest.py b/sdk/core/azure-core/tests/async_tests/conftest.py index 17c93009a373..c9bb6be411d4 100644 --- a/sdk/core/azure-core/tests/async_tests/conftest.py +++ b/sdk/core/azure-core/tests/async_tests/conftest.py @@ -82,19 +82,6 @@ def testserver(): yield terminate_testserver(server) - -# Ignore collection of async tests for Python 2 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") - @pytest.fixture def client(port): return AsyncTestRestClient(port) - -import sys - -# Ignore collection of async tests for Python 2 -collect_ignore = [] -if sys.version_info < (3, 5): - collect_ignore.append("async_tests") diff --git a/sdk/core/azure-core/tests/conftest.py b/sdk/core/azure-core/tests/conftest.py index 99273ebe1806..d8c65639bbb5 100644 --- a/sdk/core/azure-core/tests/conftest.py +++ b/sdk/core/azure-core/tests/conftest.py @@ -34,12 +34,6 @@ from rest_client import TestRestClient import sys -# Ignore collection of async tests for Python 2 -collect_ignore = [] -if sys.version_info < (3, 5): - collect_ignore.append("async_tests") - - # If opencensus is loadable while doing these tests, register an empty tracer to avoid this: # https://github.com/census-instrumentation/opencensus-python/issues/442 try: diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml index 77ac049ef0f1..3f029f1d8a48 100644 --- a/sdk/core/ci.yml +++ b/sdk/core/ci.yml @@ -31,11 +31,6 @@ extends: template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml parameters: ServiceDirectory: core - MatrixConfigs: - - Name: core_ci_matrix - Path: sdk/core/platform-matrix.json - Selection: sparse - GenerateVMJobs: true Artifacts: - name: azure-core safeName: azurecore diff --git a/sdk/core/platform-matrix.json b/sdk/core/platform-matrix.json deleted file mode 100644 index 8eedc22dc0be..000000000000 --- a/sdk/core/platform-matrix.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "matrix": { - "$IMPORT": "eng/pipelines/templates/stages/platform-matrix.json" - }, - "include": [ - { - "Config": { - "Ubuntu2004_py27": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", - "PythonVersion": "2.7", - "CoverageArg": "--disablecov", - "TestSamples": "false" - } - } - } - ] -} diff --git a/sdk/identity/azure-identity/setup.cfg b/sdk/identity/azure-identity/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/identity/azure-identity/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1