diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml index 9d896c61aeca..280fb1133edd 100644 --- a/eng/.docsettings.yml +++ b/eng/.docsettings.yml @@ -101,6 +101,8 @@ known_content_issues: - ['sdk/attestation/azure-security-attestation/swagger/README.md', '#4554'] - ['sdk/core/azure-core/tests/testserver_tests/coretestserver/README.rst', '#4554'] - ['sdk/media/azure-media-analytics-edge/README.md', '#4554'] + - ['sdk/remoterendering/azure-mixedreality-remoterendering/README.md', '#4554'] + - ['sdk/modelsrepository/azure-iot-modelsrepository/README.md', '#4554'] # common. - ['sdk/appconfiguration/azure-appconfiguration/README.md', 'common'] diff --git a/sdk/agrifood/azure-agrifood-farming/CHANGELOG.md b/sdk/agrifood/azure-agrifood-farming/CHANGELOG.md index 1daced6f5a39..623e8ae7da39 100644 --- a/sdk/agrifood/azure-agrifood-farming/CHANGELOG.md +++ b/sdk/agrifood/azure-agrifood-farming/CHANGELOG.md @@ -1,5 +1,13 @@ # Release History +## 1.0.0b2 (Unreleased) + +### Bugs Fixed + +### Other Changes + +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 1.0.0b1 (2021-05-25) - This is the initial release of the Azure AgriFood Farming library. diff --git a/sdk/agrifood/azure-agrifood-farming/README.md b/sdk/agrifood/azure-agrifood-farming/README.md index af0ebc1af5f3..325ceee9e2db 100644 --- a/sdk/agrifood/azure-agrifood-farming/README.md +++ b/sdk/agrifood/azure-agrifood-farming/README.md @@ -16,7 +16,7 @@ Use FarmBeats client library for Python to do the following. To use this package, you must have: - Azure subscription - [Create a free account][azure_subscription] - Azure FarmBeats resource - [Install FarmBeats][install_farmbeats] -- Python 2.7, 3.6 or later - [Install Python][python] +- 3.6 or later - [Install Python][python] ### Install the package diff --git a/sdk/agrifood/azure-agrifood-farming/azure/agrifood/farming/_version.py b/sdk/agrifood/azure-agrifood-farming/azure/agrifood/farming/_version.py index e5754a47ce68..dfa6ee022f15 100644 --- a/sdk/agrifood/azure-agrifood-farming/azure/agrifood/farming/_version.py +++ b/sdk/agrifood/azure-agrifood-farming/azure/agrifood/farming/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.0.0b1" +VERSION = "1.0.0b2" diff --git a/sdk/agrifood/azure-agrifood-farming/dev_requirements.txt b/sdk/agrifood/azure-agrifood-farming/dev_requirements.txt index 8336dfdf8a77..3e884a9b5c67 100644 --- a/sdk/agrifood/azure-agrifood-farming/dev_requirements.txt +++ b/sdk/agrifood/azure-agrifood-farming/dev_requirements.txt @@ -3,4 +3,4 @@ ../../core/azure-core -e ../../identity/azure-identity ../../nspkg/azure-agrifood-nspkg -aiohttp>=3.0; python_version >= '3.5' \ No newline at end of file +aiohttp>=3.0 \ No newline at end of file diff --git a/sdk/agrifood/azure-agrifood-farming/setup.cfg b/sdk/agrifood/azure-agrifood-farming/setup.cfg deleted file mode 100644 index 3480374bc2f2..000000000000 --- a/sdk/agrifood/azure-agrifood-farming/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 \ No newline at end of file diff --git a/sdk/agrifood/azure-agrifood-farming/setup.py b/sdk/agrifood/azure-agrifood-farming/setup.py index 40c8a8749b8c..f9c7681ebb19 100644 --- a/sdk/agrifood/azure-agrifood-farming/setup.py +++ b/sdk/agrifood/azure-agrifood-farming/setup.py @@ -20,21 +20,6 @@ # a-b-c => a.b.c namespace_name = PACKAGE_NAME.replace('-', '.') -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - try: - ver = azure.__version__ - raise Exception( - 'This package is incompatible with azure=={}. '.format(ver) + - 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', @@ -61,13 +46,13 @@ classifiers=[ "Development Status :: 4 - Beta", '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', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], zip_safe=False, @@ -77,13 +62,10 @@ 'azure', 'azure.agrifood', ]), + python_requires=">=3.6", install_requires=[ "azure-core<2.0.0,>=1.14.0", "msrest>=0.6.21", 'six>=1.11.0', ], - extras_require={ - ":python_version<'3.0'": ['azure-agrifood-nspkg'], - ":python_version<'3.5'": ['typing'], - } -) \ No newline at end of file +) diff --git a/sdk/agrifood/azure-agrifood-farming/tests/conftest.py b/sdk/agrifood/azure-agrifood-farming/tests/conftest.py index a6ab83f7f5f0..e69de29bb2d1 100644 --- a/sdk/agrifood/azure-agrifood-farming/tests/conftest.py +++ b/sdk/agrifood/azure-agrifood-farming/tests/conftest.py @@ -1,15 +0,0 @@ -# coding: utf-8 -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- - -import sys - -# fixture needs to be visible from conftest - -# Ignore async tests for Python < 3.5 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") \ No newline at end of file diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/CHANGELOG.md b/sdk/anomalydetector/azure-ai-anomalydetector/CHANGELOG.md index b97b0ed67f60..6c301e9600e0 100644 --- a/sdk/anomalydetector/azure-ai-anomalydetector/CHANGELOG.md +++ b/sdk/anomalydetector/azure-ai-anomalydetector/CHANGELOG.md @@ -10,6 +10,8 @@ ### Other Changes +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 3.0.0b5 (2022-01-23) - Fix release issues diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/README.md b/sdk/anomalydetector/azure-ai-anomalydetector/README.md index 277d153b8256..15cae23d7515 100644 --- a/sdk/anomalydetector/azure-ai-anomalydetector/README.md +++ b/sdk/anomalydetector/azure-ai-anomalydetector/README.md @@ -1,7 +1,7 @@ # Microsoft Azure SDK for Python This is the Microsoft Azure Cognitive Services Anomaly Detector Client Library. -This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8. +This package has been tested with Python 3.6+. For a more complete set of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all). @@ -11,12 +11,10 @@ For a more complete set of Azure libraries, see the For code examples, see [Cognitive Services Anomaly Detector](https://docs.microsoft.com/python/api/overview/azure/cognitive-services) on docs.microsoft.com. - # Provide Feedback If you encounter any bugs or have suggestions, please file an issue in the [Issues](https://github.com/Azure/azure-sdk-for-python/issues) section of the project. - ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-cognitiveservices-anomalydetector%2FREADME.png) diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/setup.cfg b/sdk/anomalydetector/azure-ai-anomalydetector/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/anomalydetector/azure-ai-anomalydetector/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/setup.py b/sdk/anomalydetector/azure-ai-anomalydetector/setup.py index 8abc7df644a2..d36eab1527c1 100644 --- a/sdk/anomalydetector/azure-ai-anomalydetector/setup.py +++ b/sdk/anomalydetector/azure-ai-anomalydetector/setup.py @@ -49,13 +49,13 @@ classifiers=[ "Development Status :: 4 - Beta", '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.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], zip_safe=False, @@ -65,12 +65,10 @@ 'azure', 'azure.ai', ]), + python_requires=">=3.6", install_requires=[ 'msrest>=0.6.21', 'azure-common~=1.1', 'azure-core>=1.6.0,<2.0.0', ], - extras_require={ - ":python_version<'3.0'": ['azure-ai-nspkg'], - } ) diff --git a/sdk/attestation/azure-security-attestation/CHANGELOG.md b/sdk/attestation/azure-security-attestation/CHANGELOG.md index 8eb32e58bc11..d687d52ad803 100644 --- a/sdk/attestation/azure-security-attestation/CHANGELOG.md +++ b/sdk/attestation/azure-security-attestation/CHANGELOG.md @@ -10,6 +10,8 @@ ### Other Changes +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 1.0.0 (2021-07-06) ### Features Added diff --git a/sdk/attestation/azure-security-attestation/README.md b/sdk/attestation/azure-security-attestation/README.md index 39892a5181c2..1b9512733736 100644 --- a/sdk/attestation/azure-security-attestation/README.md +++ b/sdk/attestation/azure-security-attestation/README.md @@ -8,7 +8,7 @@ Azure Attestation enables cutting-edge security paradigms such as Azure Confiden Azure Attestation receives evidence from compute entities, turns them into a set of claims, validates them against configurable policies, and produces cryptographic proofs for claims-based applications (for example, relying parties and auditing authorities). -This package has been tested with Python 2.7, 3.6 to 3.9. +This package has been tested with Python 3.6+. For a more complete view of Azure libraries, see the [Azure SDK for Python release page](https://aka.ms/azsdk/python/all). diff --git a/sdk/attestation/azure-security-attestation/dev_requirements.txt b/sdk/attestation/azure-security-attestation/dev_requirements.txt index 44c73f0ab90b..02e19cc3fed6 100644 --- a/sdk/attestation/azure-security-attestation/dev_requirements.txt +++ b/sdk/attestation/azure-security-attestation/dev_requirements.txt @@ -1,8 +1,7 @@ -e ../../../tools/azure-sdk-tools -aiohttp>=3.0; python_version >= '3.5' +aiohttp>=3.0 -e ../../../tools/azure-devtools -e ../../../tools/azure-sdk-tools ../../core/azure-core -aiohttp>=3.0; python_version >= '3.5' azure-identity ../../nspkg/azure-security-nspkg \ No newline at end of file diff --git a/sdk/attestation/azure-security-attestation/setup.cfg b/sdk/attestation/azure-security-attestation/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/attestation/azure-security-attestation/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/attestation/azure-security-attestation/setup.py b/sdk/attestation/azure-security-attestation/setup.py index 60b2a13a579c..3fcd4b47f07a 100644 --- a/sdk/attestation/azure-security-attestation/setup.py +++ b/sdk/attestation/azure-security-attestation/setup.py @@ -20,22 +20,6 @@ # a-b-c => a.b.c namespace_name = PACKAGE_NAME.replace("-", ".") -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - - try: - ver = azure.__version__ - raise Exception( - "This package is incompatible with azure=={}. ".format(ver) - + 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, "_version.py"), "r") as fd: version = re.search( @@ -65,13 +49,13 @@ 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", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "License :: OSI Approved :: MIT License", ], zip_safe=False, @@ -83,12 +67,10 @@ "azure.security", ] ), + python_requires=">=3.6", install_requires=[ "azure-core<2.0.0,>=1.8.2", "cryptography>=2.1.4", "msrest>=0.6.21", ], - extras_require={ - ":python_version<'3.0'": ["azure-security-nspkg"], - }, ) diff --git a/sdk/attestation/azure-security-attestation/tests/conftest.py b/sdk/attestation/azure-security-attestation/tests/conftest.py index 2417c02734d8..e69de29bb2d1 100644 --- a/sdk/attestation/azure-security-attestation/tests/conftest.py +++ b/sdk/attestation/azure-security-attestation/tests/conftest.py @@ -1,6 +0,0 @@ -import sys - -# Ignore collection of async tests for Python 2 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") diff --git a/sdk/batch/azure-batch/README.md b/sdk/batch/azure-batch/README.md index 87fcb927fae4..06658c0e41d6 100644 --- a/sdk/batch/azure-batch/README.md +++ b/sdk/batch/azure-batch/README.md @@ -2,7 +2,7 @@ This is the Microsoft Azure Batch Client Library. -This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8 +This package has been tested with Python 3.6+ For a more complete set of Azure libraries, see https://aka.ms/azsdk/python/all diff --git a/sdk/batch/azure-batch/setup.cfg b/sdk/batch/azure-batch/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/batch/azure-batch/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/batch/azure-batch/setup.py b/sdk/batch/azure-batch/setup.py index cdc0486a2523..341c40f35f0b 100644 --- a/sdk/batch/azure-batch/setup.py +++ b/sdk/batch/azure-batch/setup.py @@ -20,21 +20,6 @@ # a-b-c => a.b.c namespace_name = PACKAGE_NAME.replace('-', '.') -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - try: - ver = azure.__version__ - raise Exception( - 'This package is incompatible with azure=={}. '.format(ver) + - 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', @@ -61,13 +46,13 @@ 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.4', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], zip_safe=False, @@ -76,12 +61,10 @@ # Exclude packages that will be covered by PEP420 or nspkg 'azure', ]), + python_requires=">=3.6", install_requires=[ 'msrest>=0.6.21', 'msrestazure>=0.4.32,<2.0.0', 'azure-common~=1.1', ], - extras_require={ - ":python_version<'3.0'": ['azure-nspkg'], - } ) diff --git a/sdk/confidentialledger/azure-confidentialledger/CHANGELOG.md b/sdk/confidentialledger/azure-confidentialledger/CHANGELOG.md index c6ecc255bb09..0dddf2e275d3 100644 --- a/sdk/confidentialledger/azure-confidentialledger/CHANGELOG.md +++ b/sdk/confidentialledger/azure-confidentialledger/CHANGELOG.md @@ -1,5 +1,13 @@ # Release History +## 1.0.0b2 (Unreleased) + +### Bugs Fixed + +### Other Changes + +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 1.0.0b1 (2021-05-12) - This is the initial release of the Azure Confidential Ledger library. \ No newline at end of file diff --git a/sdk/confidentialledger/azure-confidentialledger/README.md b/sdk/confidentialledger/azure-confidentialledger/README.md index 033bdcb9e579..6dbd304a0944 100644 --- a/sdk/confidentialledger/azure-confidentialledger/README.md +++ b/sdk/confidentialledger/azure-confidentialledger/README.md @@ -15,7 +15,7 @@ authentication as demonstrated below. ### Prerequisites * An [Azure subscription][azure_sub] -* Python 2.7, 3.5.3, or later +* Python 3.6 or later * A running instance of Azure Confidential Ledger. * A registered user in the Confidential Ledger, typically assigned during [ARM][azure_resource_manager] resource creation, with `Administrator` privileges. diff --git a/sdk/confidentialledger/azure-confidentialledger/azure/confidentialledger/_version.py b/sdk/confidentialledger/azure-confidentialledger/azure/confidentialledger/_version.py index ac9f392f513e..e1816f2340d7 100644 --- a/sdk/confidentialledger/azure-confidentialledger/azure/confidentialledger/_version.py +++ b/sdk/confidentialledger/azure-confidentialledger/azure/confidentialledger/_version.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. # ------------------------------------ -VERSION = "1.0.0b1" +VERSION = "1.0.0b2" diff --git a/sdk/confidentialledger/azure-confidentialledger/dev_requirements.txt b/sdk/confidentialledger/azure-confidentialledger/dev_requirements.txt index 4f6d4bfa308d..269c61b9ffb0 100644 --- a/sdk/confidentialledger/azure-confidentialledger/dev_requirements.txt +++ b/sdk/confidentialledger/azure-confidentialledger/dev_requirements.txt @@ -1,4 +1,4 @@ -e ../../../tools/azure-sdk-tools ../../core/azure-core -e ../../../tools/azure-devtools -aiohttp>=3.0; python_version >= '3.5' \ No newline at end of file +aiohttp>=3.0 \ No newline at end of file diff --git a/sdk/confidentialledger/azure-confidentialledger/setup.cfg b/sdk/confidentialledger/azure-confidentialledger/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/confidentialledger/azure-confidentialledger/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/confidentialledger/azure-confidentialledger/setup.py b/sdk/confidentialledger/azure-confidentialledger/setup.py index 288a367558d5..60b3556ed7ed 100644 --- a/sdk/confidentialledger/azure-confidentialledger/setup.py +++ b/sdk/confidentialledger/azure-confidentialledger/setup.py @@ -15,10 +15,6 @@ # with "azure-". Ensure that the below arguments to setup() are updated to reflect # your package. -# this setup.py is set up in a specific way to keep the azure* and azure-mgmt-* namespaces WORKING -# all the way up from python 2.7. -# Reference here: https://github.com/Azure/azure-sdk-for-python/wiki/Azure-packaging - PACKAGE_NAME = "azure-confidentialledger" PACKAGE_PPRINT_NAME = "Confidential Ledger" @@ -55,13 +51,13 @@ classifiers=[ "Development Status :: 4 - Beta", "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", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "License :: OSI Approved :: MIT License", ], zip_safe=False, @@ -70,14 +66,10 @@ # Exclude packages that will be covered by PEP420 or nspkg "azure" ]), + python_requires=">=3.6", install_requires=[ "azure-common~=1.1", "azure-core<2.0.0,>=1.2.2", "msrest>=0.6.21", ], - 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/confidentialledger/azure-confidentialledger/tests/conftest.py b/sdk/confidentialledger/azure-confidentialledger/tests/conftest.py index 9605bcfa9d7d..e69de29bb2d1 100644 --- a/sdk/confidentialledger/azure-confidentialledger/tests/conftest.py +++ b/sdk/confidentialledger/azure-confidentialledger/tests/conftest.py @@ -1,6 +0,0 @@ -import sys - -# Ignore collection of async tests for Python < 3.5 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") diff --git a/sdk/core/azure-common/CHANGELOG.md b/sdk/core/azure-common/CHANGELOG.md index a93f62e0f733..57196fba018c 100644 --- a/sdk/core/azure-common/CHANGELOG.md +++ b/sdk/core/azure-common/CHANGELOG.md @@ -10,6 +10,8 @@ ### Other Changes +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 1.1.28 (2022-02-03) - Raise a NotImplementedError if trying to use CLI credentials were CLI version is higher than 2.21.0 #20657 #21313 diff --git a/sdk/core/azure-common/setup.cfg b/sdk/core/azure-common/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/core/azure-common/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/core/azure-common/setup.py b/sdk/core/azure-common/setup.py index 8cf2b962a094..8e9f89bac9b9 100644 --- a/sdk/core/azure-common/setup.py +++ b/sdk/core/azure-common/setup.py @@ -19,21 +19,6 @@ # a-b-c => a.b.c namespace_name = PACKAGE_NAME.replace('-', '.') -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - try: - ver = azure.__version__ - raise Exception( - 'This package is incompatible with azure=={}. '.format(ver) + - 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', @@ -60,14 +45,13 @@ 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.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], zip_safe=False, @@ -75,7 +59,5 @@ 'azure.common', 'azure.profiles' ], - extras_require={ - ":python_version<'3.0'": ['azure-nspkg'], - } + python_requires=">=3.6", ) diff --git a/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md b/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md index d0bb26e168f9..6c912ba6761c 100644 --- a/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opencensus/CHANGELOG.md @@ -10,6 +10,9 @@ ### Fixed +### Other Changes + +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. ## 1.0.0b8 (2021-07-01) diff --git a/sdk/core/azure-core-tracing-opencensus/setup.cfg b/sdk/core/azure-core-tracing-opencensus/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/core/azure-core-tracing-opencensus/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/core/azure-core-tracing-opencensus/setup.py b/sdk/core/azure-core-tracing-opencensus/setup.py index b0255ab84c84..b3d21208122c 100644 --- a/sdk/core/azure-core-tracing-opencensus/setup.py +++ b/sdk/core/azure-core-tracing-opencensus/setup.py @@ -43,27 +43,24 @@ classifiers=[ "Development Status :: 4 - Beta", '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.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], zip_safe=False, packages=[ 'azure.core.tracing.ext.opencensus_span', ], + python_requires=">=3.6", install_requires=[ 'opencensus>=0.6.0', 'opencensus-ext-azure>=0.3.1', 'opencensus-ext-threading', 'azure-core<2.0.0,>=1.13.0', ], - extras_require={ - ":python_version<'3.5'": ['typing'], - } ) diff --git a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md index b6ceb193012f..604253a37456 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.0.0b10 (Unreleased) +### Other Changes + +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. ## 1.0.0b9 (2021-04-06) diff --git a/sdk/core/azure-core-tracing-opentelemetry/setup.cfg b/sdk/core/azure-core-tracing-opentelemetry/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/core/azure-core-tracing-opentelemetry/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/core/azure-core-tracing-opentelemetry/setup.py b/sdk/core/azure-core-tracing-opentelemetry/setup.py index 1ee97901380e..5c9d77e78553 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/setup.py +++ b/sdk/core/azure-core-tracing-opentelemetry/setup.py @@ -43,23 +43,22 @@ classifiers=[ "Development Status :: 4 - Beta", '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', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], zip_safe=False, packages=[ 'azure.core.tracing.ext.opentelemetry_span', ], - python_requires=">=3.6.0", + python_requires=">=3.6", install_requires=[ 'opentelemetry-api<2.0.0,>=1.0.0', 'azure-core<2.0.0,>=1.13.0', ], - extras_require={ - ":python_version<'3.5'": ['typing'], - } ) diff --git a/sdk/mixedreality/azure-mixedreality-authentication/CHANGELOG.md b/sdk/mixedreality/azure-mixedreality-authentication/CHANGELOG.md index a819a424c93a..3e8a64a27f31 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/CHANGELOG.md +++ b/sdk/mixedreality/azure-mixedreality-authentication/CHANGELOG.md @@ -10,6 +10,8 @@ ### Other Changes +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 1.0.0b1 (2021-11-12) ### Features Added diff --git a/sdk/mixedreality/azure-mixedreality-authentication/README.md b/sdk/mixedreality/azure-mixedreality-authentication/README.md index e538a3fe5308..cf53345d093e 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/README.md +++ b/sdk/mixedreality/azure-mixedreality-authentication/README.md @@ -12,7 +12,7 @@ token from the STS that can be used to access Mixed Reality services. ## Currently supported environments -This package has been tested with Python 2.7, 3.5, 3.6, 3.7, 3.8, and 3.9. +This package has been tested with Python 3.6+. ## Prerequisites @@ -21,7 +21,7 @@ This package has been tested with Python 2.7, 3.5, 3.6, 3.7, 3.8, and 3.9. - [Azure Remote Rendering](https://docs.microsoft.com/azure/remote-rendering/) - [Azure Spatial Anchors](https://docs.microsoft.com/azure/spatial-anchors/) - Familiarity with the authentication and credential concepts from the [Azure Identity library][azure_identity]. -- Python 2.7, or 3.5 or later is required to use this package. +- Python 3.6 or later is required to use this package. ## Install the package diff --git a/sdk/mixedreality/azure-mixedreality-authentication/dev_requirements.txt b/sdk/mixedreality/azure-mixedreality-authentication/dev_requirements.txt index d335d063d9e4..7464aa14f304 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/dev_requirements.txt +++ b/sdk/mixedreality/azure-mixedreality-authentication/dev_requirements.txt @@ -1,5 +1,5 @@ -e ../../../tools/azure-sdk-tools ../../nspkg/azure-mixedreality-nspkg ../../core/azure-core -aiohttp>=3.0; python_version >= '3.5' +aiohttp>=3.0 -e ../../../tools/azure-devtools diff --git a/sdk/mixedreality/azure-mixedreality-authentication/setup.cfg b/sdk/mixedreality/azure-mixedreality-authentication/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/mixedreality/azure-mixedreality-authentication/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/mixedreality/azure-mixedreality-authentication/setup.py b/sdk/mixedreality/azure-mixedreality-authentication/setup.py index fc410f459fd6..2080c5355aac 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/setup.py +++ b/sdk/mixedreality/azure-mixedreality-authentication/setup.py @@ -7,9 +7,6 @@ # with "azure-". Ensure that the below arguments to setup() are updated to reflect # your package. -# this setup.py is set up in a specific way to keep the azure* and azure-mgmt-* namespaces WORKING all the way -# up from python 2.7. Reference here: https://github.com/Azure/azure-sdk-for-python/wiki/Azure-packaging - PACKAGE_NAME = "azure-mixedreality-authentication" PACKAGE_PPRINT_NAME = "Mixed Reality Authentication" @@ -47,16 +44,14 @@ # ensure that the development status reflects the status of your package classifiers=[ "Development Status :: 4 - Beta", - '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.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], packages=find_packages(exclude=[ @@ -65,14 +60,11 @@ 'azure', 'azure.mixedreality' ]), + python_requires=">=3.6", install_requires=[ 'azure-core<2.0.0,>=1.4.0', 'msrest>=0.6.21' ], - extras_require={ - ":python_version<'3.0'": ['azure-mixedreality-nspkg'], - ":python_version<'3.5'": ["typing"] - }, project_urls={ 'Bug Reports': 'https://github.com/Azure/azure-sdk-for-python/issues', 'Source': 'https://github.com/Azure/azure-sdk-python', diff --git a/sdk/mixedreality/azure-mixedreality-authentication/tests/conftest.py b/sdk/mixedreality/azure-mixedreality-authentication/tests/conftest.py index 9f69fcac8bdc..e69de29bb2d1 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/tests/conftest.py +++ b/sdk/mixedreality/azure-mixedreality-authentication/tests/conftest.py @@ -1,11 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import sys - -# Ignore collection of async tests for Python 2 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/CHANGELOG.md b/sdk/modelsrepository/azure-iot-modelsrepository/CHANGELOG.md index b2de11d85697..00db0af00a02 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/CHANGELOG.md +++ b/sdk/modelsrepository/azure-iot-modelsrepository/CHANGELOG.md @@ -2,7 +2,7 @@ ## 1.0.0b2 (Unreleased) -* TBD +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. ## 1.0.0b1 (2021-04-27) diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/LICENSE b/sdk/modelsrepository/azure-iot-modelsrepository/LICENSE new file mode 100644 index 000000000000..b2f52a2bad4e --- /dev/null +++ b/sdk/modelsrepository/azure-iot-modelsrepository/LICENSE @@ -0,0 +1,21 @@ +Copyright (c) Microsoft Corporation. + +MIT License + +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. diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in b/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in index 1071130923d5..9b40e341aee3 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in +++ b/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in @@ -1,5 +1,7 @@ +include _meta.json +recursive-include tests *.py include *.md include azure/__init__.py include azure/iot/__init__.py recursive-include samples *.py -recursive-include tests *.py \ No newline at end of file +include LICENSE diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/sdk_packaging.toml b/sdk/modelsrepository/azure-iot-modelsrepository/sdk_packaging.toml new file mode 100644 index 000000000000..a40fb1ced948 --- /dev/null +++ b/sdk/modelsrepository/azure-iot-modelsrepository/sdk_packaging.toml @@ -0,0 +1,10 @@ +[packaging] +package_name = "azure-iot-modelsrepository" +package_nspkg = "azure-iot-nspkg" +package_pprint_name = "MyService Management" +package_doc_id = "" +is_stable = false +is_arm = false +need_msrestazure = false +need_azuremgmtcore = false +auto_update = false diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/setup.cfg b/sdk/modelsrepository/azure-iot-modelsrepository/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/modelsrepository/azure-iot-modelsrepository/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/setup.py b/sdk/modelsrepository/azure-iot-modelsrepository/setup.py index 1b2aad135ab7..01abe1ee8ec7 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/setup.py +++ b/sdk/modelsrepository/azure-iot-modelsrepository/setup.py @@ -7,23 +7,6 @@ import re from setuptools import setup, find_packages -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - - try: - ver = azure.__version__ - raise Exception( - "This package is incompatible with azure=={}. ".format(ver) - + 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - - # Fetch description with open("README.md", "r") as fh: _long_description = fh.read() @@ -56,21 +39,19 @@ "Topic :: Software Development :: Libraries :: Python Modules", "License :: OSI Approved :: MIT License", "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.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], install_requires=[ "azure-core<2.0.0,>=1.2.2", "six>=1.11.0", ], - extras_require={":python_version<'3.0'": ["azure-iot-nspkg"]}, - python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3*, !=3.4.*", + python_requires=">=3.6", packages=find_packages( exclude=[ "tests", diff --git a/sdk/purview/azure-purview-administration/CHANGELOG.md b/sdk/purview/azure-purview-administration/CHANGELOG.md index 95354f560749..6027766dd092 100644 --- a/sdk/purview/azure-purview-administration/CHANGELOG.md +++ b/sdk/purview/azure-purview-administration/CHANGELOG.md @@ -10,6 +10,8 @@ ### Other Changes +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 1.0.0b1 (2021-09-29) - This is the initial release of the Azure Purview Administration library. diff --git a/sdk/purview/azure-purview-administration/README.md b/sdk/purview/azure-purview-administration/README.md index d9a5530ee44c..3d7d7ba02c3d 100644 --- a/sdk/purview/azure-purview-administration/README.md +++ b/sdk/purview/azure-purview-administration/README.md @@ -8,13 +8,13 @@ Azure Purview is a fully managed cloud service. ## _Disclaimer_ -_Azure SDK Python packages support for Python 2.7 is ending 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ +_Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ ## Getting started ### Prerequisites -- Python 2.7, or 3.6 or later is required to use this package. +- Python 3.6 or later is required to use this package. - You must have an [Azure subscription][azure_subscription] and a [Purview][purview_resource] to use this package. #### Create a Purview Resource diff --git a/sdk/purview/azure-purview-administration/dev_requirements.txt b/sdk/purview/azure-purview-administration/dev_requirements.txt index 45bdbbd581f4..49a7ca176afe 100644 --- a/sdk/purview/azure-purview-administration/dev_requirements.txt +++ b/sdk/purview/azure-purview-administration/dev_requirements.txt @@ -2,4 +2,4 @@ -e ../../../tools/azure-devtools -e ../../identity/azure-identity ../../nspkg/azure-purview-nspkg -aiohttp>=3.0; python_version >= '3.5' \ No newline at end of file +aiohttp>=3.0 \ No newline at end of file diff --git a/sdk/purview/azure-purview-administration/setup.cfg b/sdk/purview/azure-purview-administration/setup.cfg deleted file mode 100644 index 3480374bc2f2..000000000000 --- a/sdk/purview/azure-purview-administration/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 \ No newline at end of file diff --git a/sdk/purview/azure-purview-administration/setup.py b/sdk/purview/azure-purview-administration/setup.py index 1869a553dad6..903189a0f3a9 100644 --- a/sdk/purview/azure-purview-administration/setup.py +++ b/sdk/purview/azure-purview-administration/setup.py @@ -20,21 +20,6 @@ # a-b-c => a.b.c namespace_name = PACKAGE_NAME.replace('-', '.') -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - try: - ver = azure.__version__ - raise Exception( - 'This package is incompatible with azure=={}. '.format(ver) + - 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', @@ -61,8 +46,7 @@ classifiers=[ "Development Status :: 4 - Beta", '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', @@ -78,13 +62,10 @@ 'azure', 'azure.purview', ]), + python_requires=">=3.6", install_requires=[ "azure-core<2.0.0,>=1.18.0", "msrest>=0.6.21", 'six>=1.11.0', ], - extras_require={ - ":python_version<'3.0'": ['azure-purview-nspkg'], - ":python_version<'3.5'": ['typing'], - } -) \ No newline at end of file +) diff --git a/sdk/purview/azure-purview-administration/tests/conftest.py b/sdk/purview/azure-purview-administration/tests/conftest.py index a6ab83f7f5f0..e69de29bb2d1 100644 --- a/sdk/purview/azure-purview-administration/tests/conftest.py +++ b/sdk/purview/azure-purview-administration/tests/conftest.py @@ -1,15 +0,0 @@ -# coding: utf-8 -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- - -import sys - -# fixture needs to be visible from conftest - -# Ignore async tests for Python < 3.5 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") \ No newline at end of file diff --git a/sdk/purview/azure-purview-catalog/README.md b/sdk/purview/azure-purview-catalog/README.md index d71bc389705f..8812b4d0c5ba 100644 --- a/sdk/purview/azure-purview-catalog/README.md +++ b/sdk/purview/azure-purview-catalog/README.md @@ -12,7 +12,7 @@ Azure Purview Catalog is a fully managed cloud service whose users can discover ## _Disclaimer_ -_Azure SDK Python packages support for Python 2.7 is ending 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ +_Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ ## Getting started diff --git a/sdk/purview/azure-purview-catalog/tests/conftest.py b/sdk/purview/azure-purview-catalog/tests/conftest.py index 5d6370a97617..e69de29bb2d1 100644 --- a/sdk/purview/azure-purview-catalog/tests/conftest.py +++ b/sdk/purview/azure-purview-catalog/tests/conftest.py @@ -1,15 +0,0 @@ -# coding: utf-8 -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- - -import sys - -# fixture needs to be visible from conftest - -# Ignore async tests for Python < 3.5 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") diff --git a/sdk/purview/azure-purview-scanning/CHANGELOG.md b/sdk/purview/azure-purview-scanning/CHANGELOG.md index 8316be0a8ae5..4950ebd87b1d 100644 --- a/sdk/purview/azure-purview-scanning/CHANGELOG.md +++ b/sdk/purview/azure-purview-scanning/CHANGELOG.md @@ -10,6 +10,8 @@ ### Other Changes +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 1.0.0b2 (2021-09-29) **Features** diff --git a/sdk/purview/azure-purview-scanning/README.md b/sdk/purview/azure-purview-scanning/README.md index f48ecfa8307d..447880b25769 100644 --- a/sdk/purview/azure-purview-scanning/README.md +++ b/sdk/purview/azure-purview-scanning/README.md @@ -12,13 +12,13 @@ Azure Purview Scanning is a fully managed cloud service whose users can scan you ## _Disclaimer_ -_Azure SDK Python packages support for Python 2.7 is ending 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ +_Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ ## Getting started ### Prerequisites -- Python 2.7, or 3.6 or later is required to use this package. +- Python 3.6 or later is required to use this package. - You must have an [Azure subscription][azure_subscription] and a [Purview][purview_resource] to use this package. #### Create a Purview Resource diff --git a/sdk/purview/azure-purview-scanning/dev_requirements.txt b/sdk/purview/azure-purview-scanning/dev_requirements.txt index 45bdbbd581f4..49a7ca176afe 100644 --- a/sdk/purview/azure-purview-scanning/dev_requirements.txt +++ b/sdk/purview/azure-purview-scanning/dev_requirements.txt @@ -2,4 +2,4 @@ -e ../../../tools/azure-devtools -e ../../identity/azure-identity ../../nspkg/azure-purview-nspkg -aiohttp>=3.0; python_version >= '3.5' \ No newline at end of file +aiohttp>=3.0 \ No newline at end of file diff --git a/sdk/purview/azure-purview-scanning/setup.cfg b/sdk/purview/azure-purview-scanning/setup.cfg deleted file mode 100644 index 3480374bc2f2..000000000000 --- a/sdk/purview/azure-purview-scanning/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 \ No newline at end of file diff --git a/sdk/purview/azure-purview-scanning/setup.py b/sdk/purview/azure-purview-scanning/setup.py index d59e71d7bc51..880e7a02b5b0 100644 --- a/sdk/purview/azure-purview-scanning/setup.py +++ b/sdk/purview/azure-purview-scanning/setup.py @@ -20,21 +20,6 @@ # a-b-c => a.b.c namespace_name = PACKAGE_NAME.replace('-', '.') -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - try: - ver = azure.__version__ - raise Exception( - 'This package is incompatible with azure=={}. '.format(ver) + - 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', @@ -61,8 +46,7 @@ classifiers=[ "Development Status :: 4 - Beta", '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', @@ -78,13 +62,10 @@ 'azure', 'azure.purview', ]), + python_requires=">=3.6", install_requires=[ "azure-core<2.0.0,>=1.18.0", "msrest>=0.6.21", 'six>=1.11.0', ], - extras_require={ - ":python_version<'3.0'": ['azure-purview-nspkg'], - ":python_version<'3.5'": ['typing'], - } -) \ No newline at end of file +) diff --git a/sdk/purview/azure-purview-scanning/tests/conftest.py b/sdk/purview/azure-purview-scanning/tests/conftest.py index a6ab83f7f5f0..e69de29bb2d1 100644 --- a/sdk/purview/azure-purview-scanning/tests/conftest.py +++ b/sdk/purview/azure-purview-scanning/tests/conftest.py @@ -1,15 +0,0 @@ -# coding: utf-8 -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- - -import sys - -# fixture needs to be visible from conftest - -# Ignore async tests for Python < 3.5 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") \ No newline at end of file diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md b/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md index e0282d973d9c..ee6cbc7eaf63 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md @@ -10,6 +10,8 @@ ### Other Changes +- Python 2.7 is no longer supported. Please use Python version 3.6 or later. + ## 1.0.0b1 (2021-11-15) - Initial release. diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/README.md b/sdk/remoterendering/azure-mixedreality-remoterendering/README.md index b7545fc00572..521550e4f2f2 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/README.md +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/README.md @@ -18,7 +18,7 @@ This SDK supports version "2021-01-01" of the [Remote Rendering REST API](https: ## _Disclaimer_ -_Azure SDK Python packages support for Python 2.7 is ending 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ +_Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ # Getting started diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/dev_requirements.txt b/sdk/remoterendering/azure-mixedreality-remoterendering/dev_requirements.txt index 60cacd4e638f..7cab278fd6d1 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/dev_requirements.txt +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/dev_requirements.txt @@ -2,7 +2,7 @@ ../../core/azure-core ../../nspkg/azure-mixedreality-nspkg ../../mixedreality/azure-mixedreality-authentication -aiohttp>=3.0; python_version >= '3.5' +aiohttp>=3.0 -e ../../identity/azure-identity -e ../../../tools/azure-devtools diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.cfg b/sdk/remoterendering/azure-mixedreality-remoterendering/setup.cfg deleted file mode 100644 index e2170fa288fc..000000000000 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[bdist_wheel] -universal=1 - -[metadata] -long_description_content_type=text/markdown \ No newline at end of file diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py b/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py index 8c8366d1140f..cd3132b3d91a 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py @@ -3,10 +3,6 @@ from io import open import re - -# this setup.py is set up in a specific way to keep the azure* and azure-mgmt-* namespaces WORKING all the way -# up from python 2.7. Reference here: https://github.com/Azure/azure-sdk-for-python/wiki/Azure-packaging - PACKAGE_NAME = "azure-mixedreality-remoterendering" PACKAGE_PPRINT_NAME = "Azure Remote Rendering" @@ -36,6 +32,7 @@ # ensure that these are updated to reflect the package owners' information long_description=long_description, + long_description_content_type='text/markdown', url='https://github.com/Azure/azure-sdk-for-python', author='Microsoft Corporation', author_email='azuresdkengsysadmins@microsoft.com', @@ -44,17 +41,14 @@ # ensure that the development status reflects the status of your package classifiers=[ "Development Status :: 4 - Beta", - '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.4', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], packages=find_packages(exclude=[ @@ -63,16 +57,12 @@ 'azure', 'azure.mixedreality' ]), + python_requires=">=3.6", install_requires=[ 'azure-core<2.0.0,>=1.6.0', 'azure-mixedreality-authentication>=1.0.0b1', 'msrest>=0.6.21' ], - extras_require={ - ":python_version<'3.0'": ['futures', 'azure-mixedreality-nspkg'], - ":python_version<'3.4'": ['enum34>=1.0.4'], - ":python_version<'3.5'": ["typing"] - }, project_urls={ 'Bug Reports': 'https://github.com/Azure/azure-sdk-for-python/issues', 'Source': 'https://github.com/Azure/azure-sdk-python', diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/tests/conftest.py b/sdk/remoterendering/azure-mixedreality-remoterendering/tests/conftest.py index 9f69fcac8bdc..e69de29bb2d1 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/tests/conftest.py +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/tests/conftest.py @@ -1,11 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- -import sys - -# Ignore collection of async tests for Python 2 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") diff --git a/sdk/servicefabric/azure-servicefabric/LICENSE b/sdk/servicefabric/azure-servicefabric/LICENSE new file mode 100644 index 000000000000..b2f52a2bad4e --- /dev/null +++ b/sdk/servicefabric/azure-servicefabric/LICENSE @@ -0,0 +1,21 @@ +Copyright (c) Microsoft Corporation. + +MIT License + +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. diff --git a/sdk/servicefabric/azure-servicefabric/MANIFEST.in b/sdk/servicefabric/azure-servicefabric/MANIFEST.in index cad40fe06b5f..f1d8335bba8b 100644 --- a/sdk/servicefabric/azure-servicefabric/MANIFEST.in +++ b/sdk/servicefabric/azure-servicefabric/MANIFEST.in @@ -1,4 +1,5 @@ +include _meta.json recursive-include tests *.py *.yaml include *.md include azure/__init__.py - +include LICENSE diff --git a/sdk/servicefabric/azure-servicefabric/README.md b/sdk/servicefabric/azure-servicefabric/README.md index bfc167c87a82..6793679b899e 100644 --- a/sdk/servicefabric/azure-servicefabric/README.md +++ b/sdk/servicefabric/azure-servicefabric/README.md @@ -1,9 +1,12 @@ # Microsoft Azure SDK for Python This is the Microsoft Azure Service Fabric Client Library. -This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8. +This package has been tested with Python 3.6+. For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all). +## _Disclaimer_ + +_Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ # Usage diff --git a/sdk/servicefabric/azure-servicefabric/azure/__init__.py b/sdk/servicefabric/azure-servicefabric/azure/__init__.py index 0260537a02bb..8db66d3d0f0f 100644 --- a/sdk/servicefabric/azure-servicefabric/azure/__init__.py +++ b/sdk/servicefabric/azure-servicefabric/azure/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file +__path__ = __import__("pkgutil").extend_path(__path__, __name__) diff --git a/sdk/servicefabric/azure-servicefabric/sdk_packaging.toml b/sdk/servicefabric/azure-servicefabric/sdk_packaging.toml index 16234edc592c..12b54619eee7 100644 --- a/sdk/servicefabric/azure-servicefabric/sdk_packaging.toml +++ b/sdk/servicefabric/azure-servicefabric/sdk_packaging.toml @@ -6,3 +6,4 @@ package_doc_id = "servicefabric" is_stable = true is_arm = false need_msrestazure = false +auto_update = false diff --git a/sdk/servicefabric/azure-servicefabric/setup.cfg b/sdk/servicefabric/azure-servicefabric/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/servicefabric/azure-servicefabric/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/servicefabric/azure-servicefabric/setup.py b/sdk/servicefabric/azure-servicefabric/setup.py index 3ca4444ff502..84165e936396 100644 --- a/sdk/servicefabric/azure-servicefabric/setup.py +++ b/sdk/servicefabric/azure-servicefabric/setup.py @@ -20,21 +20,6 @@ # a-b-c => a.b.c namespace_name = PACKAGE_NAME.replace('-', '.') -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - try: - ver = azure.__version__ - raise Exception( - 'This package is incompatible with azure=={}. '.format(ver) + - 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, 'version.py') if os.path.exists(os.path.join(package_folder_path, 'version.py')) @@ -63,14 +48,13 @@ 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.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], zip_safe=False, @@ -83,7 +67,5 @@ 'msrest>=0.6.21', 'azure-common~=1.1', ], - extras_require={ - ":python_version<'3.0'": ['azure-nspkg'], - } + python_requires=">=3.6" ) diff --git a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/README.md b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/README.md index 2bac411fd245..6e5a28df5e34 100644 --- a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/README.md +++ b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/README.md @@ -23,7 +23,7 @@ pip install azure-media-videoanalyzer-edge ### Prerequisites -- Python 2.7, or 3.6 or later is required to use this package. +- 3.6 or later is required to use this package. - You need an active [Azure subscription][azure_sub], and a IoT device connection string to use this package. - To interact with Azure IoT Hub you will need to run `pip install azure-iot-hub` - You will need to use the version of the SDK that corresponds to the version of the Video Analyzer Edge module you are using. diff --git a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/dev_requirements.txt b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/dev_requirements.txt index 08b52149d5f2..6d14633f7d01 100644 --- a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/dev_requirements.txt +++ b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/dev_requirements.txt @@ -2,7 +2,7 @@ -e ../../../tools/azure-sdk-tools ../../core/azure-core -e ../../identity/azure-identity -aiohttp>=3.0; python_version >= '3.5' -aiodns>=2.0; python_version >= '3.5' +aiohttp>=3.0 +aiodns>=2.0 tox>=3.20.0 tox-monorepo>=0.1.2 \ No newline at end of file diff --git a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.cfg b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.py b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.py index c9bca0b2cf26..dd36c853f82d 100644 --- a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.py +++ b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.py @@ -20,21 +20,6 @@ # a-b-c => a/b/c package_folder_path = NAMESPACE_NAME.replace('.', '/') -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - try: - ver = azure.__version__ - raise Exception( - 'This package is incompatible with azure=={}. '.format(ver) + - 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', @@ -61,13 +46,13 @@ classifiers=[ "Development Status :: 4 - Beta", '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', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], zip_safe=False, @@ -80,13 +65,9 @@ "azure.media" ] ), + python_requires=">=3.6", install_requires=[ "msrest>=0.6.21", "azure-core<2.0.0,>=1.2.2", ], - extras_require={ - ":python_version<'3.0'": ['azure-media-nspkg'], - ":python_version<'3.4'": ['enum34>=1.0.4'], - ":python_version<'3.5'": ['typing'], - } )