From 0e59733f0f18f4a24516498fef3f8a064a569c7c Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 4 May 2022 12:42:37 -0700 Subject: [PATCH 1/9] batch dropping 2.7 --- sdk/agrifood/azure-agrifood-farming/README.md | 2 +- .../dev_requirements.txt | 2 +- sdk/agrifood/azure-agrifood-farming/setup.cfg | 2 -- sdk/agrifood/azure-agrifood-farming/setup.py | 24 +++-------------- .../azure-agrifood-farming/tests/conftest.py | 15 ----------- .../azure-ai-anomalydetector/CHANGELOG.md | 2 ++ .../azure-ai-anomalydetector/README.md | 4 +-- .../azure-ai-anomalydetector/setup.cfg | 2 -- .../azure-ai-anomalydetector/setup.py | 10 +++---- .../azure-security-attestation/CHANGELOG.md | 2 ++ .../azure-security-attestation/README.md | 2 +- .../dev_requirements.txt | 3 +-- .../azure-security-attestation/setup.cfg | 2 -- .../azure-security-attestation/setup.py | 24 +++-------------- .../tests/conftest.py | 6 ----- sdk/batch/azure-batch/README.md | 2 +- sdk/batch/azure-batch/setup.cfg | 2 -- sdk/batch/azure-batch/setup.py | 27 ++++--------------- .../azure-confidentialledger/README.md | 2 +- .../dev_requirements.txt | 2 +- .../azure-confidentialledger/setup.cfg | 2 -- .../azure-confidentialledger/setup.py | 14 +++------- .../tests/conftest.py | 6 ----- sdk/core/azure-common/CHANGELOG.md | 2 ++ sdk/core/azure-common/setup.cfg | 2 -- sdk/core/azure-common/setup.py | 24 +++-------------- .../CHANGELOG.md | 3 +++ .../azure-core-tracing-opencensus/setup.cfg | 2 -- .../azure-core-tracing-opencensus/setup.py | 9 +++---- .../CHANGELOG.md | 3 +++ .../setup.cfg | 2 -- .../azure-core-tracing-opentelemetry/setup.py | 7 +++-- .../CHANGELOG.md | 2 ++ .../README.md | 4 +-- .../dev_requirements.txt | 2 +- .../setup.cfg | 2 -- .../setup.py | 13 +++------ .../tests/conftest.py | 11 -------- .../azure-iot-modelsrepository/CHANGELOG.md | 2 +- .../azure-iot-modelsrepository/setup.cfg | 2 -- .../azure-iot-modelsrepository/setup.py | 25 +++-------------- .../azure-purview-administration/CHANGELOG.md | 2 ++ .../azure-purview-administration/README.md | 4 +-- .../dev_requirements.txt | 2 +- .../azure-purview-administration/setup.cfg | 2 -- .../azure-purview-administration/setup.py | 23 ++-------------- .../tests/conftest.py | 15 ----------- sdk/purview/azure-purview-catalog/README.md | 2 +- .../azure-purview-catalog/tests/conftest.py | 15 ----------- .../azure-purview-scanning/CHANGELOG.md | 2 ++ sdk/purview/azure-purview-scanning/README.md | 4 +-- .../dev_requirements.txt | 2 +- sdk/purview/azure-purview-scanning/setup.cfg | 2 -- sdk/purview/azure-purview-scanning/setup.py | 23 ++-------------- .../azure-purview-scanning/tests/conftest.py | 15 ----------- .../CHANGELOG.md | 2 ++ .../README.md | 2 +- .../dev_requirements.txt | 2 +- .../setup.cfg | 5 ---- .../setup.py | 16 +++-------- .../tests/conftest.py | 11 -------- .../azure-servicefabric/README.md | 8 +----- .../azure-servicefabric/setup.cfg | 2 -- .../azure-servicefabric/setup.py | 23 ++-------------- .../azure-media-videoanalyzer-edge/README.md | 2 +- .../dev_requirements.txt | 4 +-- .../azure-media-videoanalyzer-edge/setup.cfg | 2 -- .../azure-media-videoanalyzer-edge/setup.py | 25 +++-------------- 68 files changed, 90 insertions(+), 403 deletions(-) delete mode 100644 sdk/agrifood/azure-agrifood-farming/setup.cfg delete mode 100644 sdk/anomalydetector/azure-ai-anomalydetector/setup.cfg delete mode 100644 sdk/attestation/azure-security-attestation/setup.cfg delete mode 100644 sdk/batch/azure-batch/setup.cfg delete mode 100644 sdk/confidentialledger/azure-confidentialledger/setup.cfg delete mode 100644 sdk/core/azure-common/setup.cfg delete mode 100644 sdk/core/azure-core-tracing-opencensus/setup.cfg delete mode 100644 sdk/core/azure-core-tracing-opentelemetry/setup.cfg delete mode 100644 sdk/mixedreality/azure-mixedreality-authentication/setup.cfg delete mode 100644 sdk/modelsrepository/azure-iot-modelsrepository/setup.cfg delete mode 100644 sdk/purview/azure-purview-administration/setup.cfg delete mode 100644 sdk/purview/azure-purview-scanning/setup.cfg delete mode 100644 sdk/remoterendering/azure-mixedreality-remoterendering/setup.cfg delete mode 100644 sdk/servicefabric/azure-servicefabric/setup.cfg delete mode 100644 sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.cfg 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/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..dde5b5cc9f2f 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', + 'Programming Language :: Python :: 3 :: Only', '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..25103f5045a8 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', - 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3 :: Only', '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..4013012ced2f 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", + "Programming Language :: Python :: 3 :: Only", "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..674898a54910 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', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3 :: Only', '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/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/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..c4b37f1015ac 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", + "Programming Language :: Python :: 3 :: Only", "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..6374fae897ac 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', - 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3 :: Only', '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..977e774fd48f 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', - 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3 :: Only', '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..5a5c5b0e84c7 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/setup.py +++ b/sdk/core/azure-core-tracing-opentelemetry/setup.py @@ -44,22 +44,21 @@ "Development Status :: 4 - Beta", 'Programming Language :: Python', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3 :: Only', '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..6c1bd45bd517 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" @@ -49,14 +46,13 @@ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3 :: Only', '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 +61,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/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..53b9326aeb0f 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", - "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3 :: Only", "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..260c9d54f688 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,9 +46,8 @@ classifiers=[ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', @@ -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..5bcb6cd34704 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,9 +46,8 @@ classifiers=[ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', @@ -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..ba1e7f3a7355 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" @@ -46,15 +42,13 @@ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3 :: Only', '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/README.md b/sdk/servicefabric/azure-servicefabric/README.md index bfc167c87a82..ae2d977723d2 100644 --- a/sdk/servicefabric/azure-servicefabric/README.md +++ b/sdk/servicefabric/azure-servicefabric/README.md @@ -1,23 +1,17 @@ # 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). - # Usage - - - For code examples, see [Service Fabric](https://docs.microsoft.com/python/api/overview/azure/servicefabric) 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-servicefabric%2FREADME.png) 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..d764a8f0752d 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,12 @@ classifiers=[ 'Development Status :: 5 - Production/Stable', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', '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, @@ -79,11 +62,9 @@ # Exclude packages that will be covered by PEP420 or nspkg 'azure', ]), + python_requires=">=3.6", install_requires=[ 'msrest>=0.6.21', 'azure-common~=1.1', ], - extras_require={ - ":python_version<'3.0'": ['azure-nspkg'], - } ) 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..93319b7117d9 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', + 'Programming Language :: Python :: 3 :: Only', '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'], - } ) From 131ee1694274772d91f794598c7bcf23fb9d7c72 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Wed, 4 May 2022 19:46:49 +0000 Subject: [PATCH 2/9] Packaging update of azure-servicefabric --- sdk/servicefabric/azure-servicefabric/LICENSE | 21 +++++++++++++++++++ .../azure-servicefabric/MANIFEST.in | 3 ++- .../azure-servicefabric/README.md | 9 ++++++++ .../azure-servicefabric/azure/__init__.py | 2 +- .../azure-servicefabric/setup.py | 5 ++++- 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 sdk/servicefabric/azure-servicefabric/LICENSE 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 ae2d977723d2..6793679b899e 100644 --- a/sdk/servicefabric/azure-servicefabric/README.md +++ b/sdk/servicefabric/azure-servicefabric/README.md @@ -4,14 +4,23 @@ This is the Microsoft Azure Service Fabric Client Library. 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 + + + For code examples, see [Service Fabric](https://docs.microsoft.com/python/api/overview/azure/servicefabric) 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-servicefabric%2FREADME.png) 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/setup.py b/sdk/servicefabric/azure-servicefabric/setup.py index d764a8f0752d..9fb7b288f745 100644 --- a/sdk/servicefabric/azure-servicefabric/setup.py +++ b/sdk/servicefabric/azure-servicefabric/setup.py @@ -45,9 +45,11 @@ author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python', + keywords="azure, azure sdk", # update with search keywords relevant to the azure service / product classifiers=[ 'Development Status :: 5 - Production/Stable', 'Programming Language :: Python', + 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', @@ -62,9 +64,10 @@ # Exclude packages that will be covered by PEP420 or nspkg 'azure', ]), - python_requires=">=3.6", install_requires=[ 'msrest>=0.6.21', 'azure-common~=1.1', + 'azure-mgmt-core>=1.3.0,<2.0.0', ], + python_requires=">=3.6" ) From dbdd3f6ed5ba647a209adc3c4dce12ec2841f796 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Wed, 4 May 2022 19:46:50 +0000 Subject: [PATCH 3/9] Packaging update of azure-iot-modelsrepository --- .../azure-iot-modelsrepository/LICENSE | 21 ++ .../azure-iot-modelsrepository/MANIFEST.in | 5 +- .../azure-iot-modelsrepository/README.md | 190 ++---------------- .../sdk_packaging.toml | 9 + .../azure-iot-modelsrepository/setup.py | 109 +++++----- 5 files changed, 108 insertions(+), 226 deletions(-) create mode 100644 sdk/modelsrepository/azure-iot-modelsrepository/LICENSE create mode 100644 sdk/modelsrepository/azure-iot-modelsrepository/sdk_packaging.toml 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..4732fdf36885 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in +++ b/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in @@ -1,5 +1,6 @@ +include _meta.json +recursive-include tests *.py *.yaml 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/README.md b/sdk/modelsrepository/azure-iot-modelsrepository/README.md index dd89a9a7d7fb..8e4da19c7fc2 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/README.md +++ b/sdk/modelsrepository/azure-iot-modelsrepository/README.md @@ -1,186 +1,30 @@ -# Azure IoT Models Repository client library for Python +# Microsoft Azure SDK for Python -The Azure IoT Models Repository Library for Python provides functionality for working with the Azure IoT Models Repository +This is the Microsoft Azure MyService Management Client Library. +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). -## Getting started +## _Disclaimer_ -### Install package +_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_ -Install the Azure IoT Models Repository library for Python with [pip][pip]: +# Usage -```Shell -pip install azure-iot-modelsrepository -``` -### Prerequisites -* A models repository following [Azure IoT conventions][repo_conventions] - * The models repository can be hosted on the local filesystem or hosted on a webserver - * Azure IoT hosts the global [Azure IoT Models Repository][global_azure_repo] which the client will use if no custom location is provided +To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt) -### Publishing Models -Follow the [guide](https://docs.microsoft.com/azure/iot-pnp/concepts-model-repository#publish-a-model) to publish models to the global Azure IoT Models Repository. -If using a custom local or remote repository, you can simply add your model files to a directory structure in the repository location, e.g. `dtmi/com/example/thermostat-1.json` + +For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/) +Code samples for this package can be found at [MyService Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com. +Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples) -### Authentication -Currently, no authentication mechanisms are supported. The global endpoint is not tied to an Azure subscription and does not support authentication. All models published are meant for anonymous public consumption. -## Key concepts +# Provide Feedback -The Azure IoT Models Repository enables builders to manage and share digital twin models. The models are [JSON-LD][json_ld] documents defined using the Digital Twins Definition Language ([DTDL][dtdl_spec]). +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. -The repository defines a pattern to store DTDL interfaces in a directory structure based on the Digital Twin Model Identifier (DTMI). You can locate an interface in the repository by converting the DTMI to a relative path. For example, the DTMI `dtmi:com:example:Thermostat;1` translates to `/dtmi/com/example/thermostat-1.json`. -## Examples -The following sections provide several snippets covering common Models Repository tasks: -* [Initializing the ModelsRepositoryClient](#initializing-the-modelsrepositoryclient "Initializing the ModelsRepositoryClient") -* [Get Models](#modelsrepositoryclient---get-models "Get models") -* [DTMI Conventions](#dtmi-conventions "DTMI Conventions") - -### Initializing the ModelsRepositoryClient - -#### Repository Location -When no repository location is provided during instantiation, the Azure IoT Models Repository global endpoint (https://devicemodels.azure.com/) is used - -```python -client = ModelsRepositoryClient() -``` - -Alternatively, you can provide a custom location for where your repository is located via the optional `repository_location` keyword. The client accepts the following location formats: -* Web URL - e.g. `"https://contoso.com/models/"` -* Local Filesystem URI - e.g. `"file:///path/to/repository/"` -* POSIX filepath - e.g. `"/path/to/repository/"` -* Drive letter filepath - e.g. `"C:/path/to/repository/"` -```python -client = ModelsRepositoryClient(repository_location="https://contoso.com/models/") -``` - -#### Dependency Resolution Mode -The client can be configured with an optional `dependency_resolution` mode at instantiation, using one of the following values: -* `'disabled'` - The client will not resolve model dependencies -* `'enabled'` - The client will resolve any model dependencies -* `'tryFromExpanded'` - The client will attempt to resolve models using an expanded model definition (falling back on `'enabled'` mode if not possible) - -```python -client = ModelsRepositoryClient(dependency_resolution="enabled") -``` - -If the `dependency_resolution` mode is not specified: -* Clients configured for the Azure IoT Models Repository global endpoint will default to using `'tryFromExpanded'` -* Clients configured for a custom location (remote or local) will default to using `'enabled'` - -#### Additional Options -If you need to override default pipeline behavior from the [azure-core library][azure_core_docs], you can provide various [keyword arguments][azure_core_kwargs] during instantiation. - -#### Client cleanup -When you are finished with your client, make sure to call `.close()` in order to free up resources - -```python -client = ModelsRepositoryClient() -# Do things -client.close() -``` - -In order to avoid having to do this, it is recommended that you use your client from within a context manager whenever possible, which will automatically close for you -```python -with ModelsRepositoryClient() as client: - # Do things -``` - -### ModelsRepositoryClient - Get Models -Note that you must first [publish models to your repository](#publishing-models "Publishing models") before you can fetch them. The following examples assume you are using the global Azure IoT Models Repository. - -Calling `.get_models()` will fetch the model at the provided DTMI and potentially its dependencies (depending on the dependency resolution mode). It will return a `dict` that maps DTMIs to model definitions. - -```python -dtmi = "dtmi:com:example:TemperatureController;1" -with ModelsRepositoryClient() as client: - models = get_models(dtmi) -print("{} resolved in {} interfaces".format(dtmi, len(models))) -``` - -If you provide multiple DTMIs to the method, you can retrieve multiple models (and potentially their dependencies) at once -```python -dtmis = ["dtmi:com:example:TemperatureController;1", "dtmi:com:example:azuresphere:sampledevice;1"] -with ModelsRepositoryClient() as client: - models = get_models(dtmis) -print("{} resolved in {} interfaces".format(dtmi, len(models))) -``` - -By default the client will use whichever [dependency resolution mode](#dependency-resolution-mode "Dependency resolution mode") it was configured with at instantiation when retrieving models. However, this behavior can be overridden by passing any of the valid options in as an optional keyword argument to `.get_models()` - -```python -dtmi = "dtmi:com:example:TemperatureController;1" -with ModelsRepositoryClient(dependency_resolution="disabled") as client: - models = get_models(dtmi, dependency_resolution="enabled") -``` - -### DTMI Conventions -The package contains a module called `dtmi_conventions`, which, when imported provides a series of utility operations for working with DTMIs - -```python -# Returns True - this is a valid DTMI -dtmi_conventions.is_valid_dtmi("dtmi:com:example:Thermostat;1") - -# Returns False - this is NOT a valid DTMI -dtmi_conventions.is_valid_dtmi("dtmi:com:example:Thermostat") -``` - -```python -dtmi = "dtmi:com:example:Thermostat;1" - -# Local repository example -repo_uri = "file:///path/to/repository" -print(dtmi_conventions.get_model_uri(dtmi, repo_uri)) -# Prints: "file:///path/to/repository/dtmi/com/example/thermostat-1.json" -print(dtmi_conventions.get_model_uri(dtmi, repo_uri, expanded=True)) -# Prints: "file:///path/to/repository/dtmi/com/example/thermostat-1.expanded.json" - -# Remote repository example -repo_uri = "https://contoso.com/models/" -print(dtmi_conventions.get_model_uri(dtmi, repo_uri)) -# Prints: "https://contoso/com/models/dtmi/com/example/thermostat-1.json" -print(dtmi_conventions.get_model_uri(dtmi, repo_uri, expanded=True)) -# Prints: "https://contoso/com/models/dtmi/com/example/thermostat-1.expanded.json" -``` - - -## Troubleshooting - -### Logging -This library uses the standard [logging][logging_doc] library for logging. Information about HTTP sessions (URLs, headers, etc.) is logged at `DEBUG` level. - -### Exceptions -Models Repository APIs may raise exceptions defined in [azure-core][azure_core_exceptions]. - -Additionally, they may raise exceptions defined in the `azure-iot-modelsrepository`: -* `ModelError` - Indicates an error occurred while trying to parse/resolve a model definition. This generally means that there is a malformed model that does not comply with the [model DTDL specification][dtdl_spec] - -### Provide Feedback -If you encounter bugs or have suggestions, please -[open an issue](https://github.com/Azure/azure-sdk-for-python/issues). - -## Next steps - -### Samples -Additional samples are available in the [samples repository][samples_repo]. - -### Contributing -This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com. - -When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA. - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - - - -[azure_core_docs]: https://azuresdkdocs.blob.core.windows.net/$web/python/azure-core/latest/azure.core.html -[azure_core_exceptions]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core#azure-core-library-exceptions -[azure_core_kwargs]: https://aka.ms/azsdk/python/options -[dtdl_spec]: https://github.com/Azure/opendigitaltwins-dtdl/blob/master/DTDL/v2/dtdlv2.md -[global_azure_repo]: https://devicemodels.azure.com/ -[json_ld]: https://json-ld.org/ -[logging_doc]: https://docs.python.org/3.5/library/logging.html -[pip]: https://pypi.org/project/pip/ -[repo_conventions]: https://github.com/Azure/iot-plugandplay-models-tools/wiki -[samples_repo]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/modelsrepository/azure-iot-modelsrepository/samples/ \ No newline at end of file +![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-iot-modelsrepository%2FREADME.png) 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..43b62f34d13f --- /dev/null +++ b/sdk/modelsrepository/azure-iot-modelsrepository/sdk_packaging.toml @@ -0,0 +1,9 @@ +[packaging] +package_name = "azure-iot-modelsrepository" +package_nspkg = "azure-iot-nspkg" +package_pprint_name = "MyService Management" +package_doc_id = "" +is_stable = false +is_arm = true +need_msrestazure = false +need_azuremgmtcore = true diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/setup.py b/sdk/modelsrepository/azure-iot-modelsrepository/setup.py index 53b9326aeb0f..7216e435d93a 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/setup.py +++ b/sdk/modelsrepository/azure-iot-modelsrepository/setup.py @@ -1,67 +1,74 @@ -# ------------------------------------------------------------------------- +#!/usr/bin/env python + +#------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for # license information. -# -------------------------------------------------------------------------- +#-------------------------------------------------------------------------- import re -from setuptools import setup, find_packages +import os.path +from io import open +from setuptools import find_packages, setup + +# Change the PACKAGE_NAME only to change folder and different name +PACKAGE_NAME = "azure-iot-modelsrepository" +PACKAGE_PPRINT_NAME = "MyService Management" -# Fetch description -with open("README.md", "r") as fh: - _long_description = fh.read() +# a-b-c => a/b/c +package_folder_path = PACKAGE_NAME.replace('-', '/') +# a-b-c => a.b.c +namespace_name = PACKAGE_NAME.replace('-', '.') +# 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')) + else os.path.join(package_folder_path, '_version.py'), 'r') as fd: + version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', + fd.read(), re.MULTILINE).group(1) -# Fetch version -with open("azure/iot/modelsrepository/_version.py", "r") as fh: - VERSION = re.search(r"^VERSION\s=\s*[\"']([^\"']*)", fh.read(), re.MULTILINE).group(1) -if not VERSION: - raise RuntimeError("Cannot find version information") +if not version: + raise RuntimeError('Cannot find version information') +with open('README.md', encoding='utf-8') as f: + readme = f.read() +with open('CHANGELOG.md', encoding='utf-8') as f: + changelog = f.read() setup( - name="azure-iot-modelsrepository", - version=VERSION, - description="Microsoft Azure IoT Models Repository Library", - license="MIT License", - author="Microsoft Corporation", - author_email="azpysdkhelp@microsoft.com", - url="https://github.com/Azure/azure-sdk-for-python", - project_urls={ - "Bug Tracker": "https://github.com/Azure/azure-sdk-for-python/issues", - "Source": "https://github.com/Azure/azure-sdk-for-python", - }, - long_description=_long_description, - long_description_content_type="text/markdown", + name=PACKAGE_NAME, + version=version, + description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), + long_description=readme + '\n\n' + changelog, + long_description_content_type='text/markdown', + license='MIT License', + author='Microsoft Corporation', + author_email='azpysdkhelp@microsoft.com', + url='https://github.com/Azure/azure-sdk-for-python', + keywords="azure, azure sdk", # update with search keywords relevant to the azure service / product classifiers=[ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", - "Topic :: Software Development :: Libraries :: Python Modules", - "License :: OSI Approved :: MIT License", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3 :: Only", - "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", + '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=find_packages(exclude=[ + 'tests', + # Exclude packages that will be covered by PEP420 or nspkg + 'azure', + 'azure.iot', + ]), install_requires=[ - "azure-core<2.0.0,>=1.2.2", - "six>=1.11.0", + 'msrest>=0.6.21', + 'azure-common~=1.1', + 'azure-mgmt-core>=1.3.0,<2.0.0', ], - python_requires=">=3.6", - packages=find_packages( - exclude=[ - "tests", - "tests.*", - "samples", - "samples.*", - # Exclude packages that will be covered by PEP420 or nspkg - "azure", - "azure.iot", - ] - ), - zip_safe=False, + python_requires=">=3.6" ) From e27ad293ef89bc36c8a59ab888028645b5f4c8c9 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 4 May 2022 13:09:28 -0700 Subject: [PATCH 4/9] update --- eng/.docsettings.yml | 2 ++ 1 file changed, 2 insertions(+) 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'] From a70769534dafb4c26f7e859be489bc5fcdb885a5 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 4 May 2022 13:48:00 -0700 Subject: [PATCH 5/9] update --- sdk/agrifood/azure-agrifood-farming/setup.py | 2 +- .../azure-ai-anomalydetector/setup.py | 2 +- .../azure-security-attestation/setup.py | 2 +- sdk/batch/azure-batch/setup.py | 2 +- .../azure-confidentialledger/setup.py | 2 +- sdk/core/azure-common/setup.py | 2 +- .../azure-core-tracing-opencensus/setup.py | 2 +- .../azure-core-tracing-opentelemetry/setup.py | 2 +- .../setup.py | 3 +- .../azure-iot-modelsrepository/MANIFEST.in | 1 + .../azure-iot-modelsrepository/README.md | 190 ++++++++++++++++-- .../sdk_packaging.toml | 5 +- .../azure-iot-modelsrepository/setup.py | 110 +++++----- .../azure-purview-administration/setup.py | 2 +- sdk/purview/azure-purview-scanning/setup.py | 2 +- .../setup.py | 3 +- .../azure-servicefabric/sdk_packaging.toml | 1 + .../azure-media-videoanalyzer-edge/setup.py | 2 +- 18 files changed, 242 insertions(+), 93 deletions(-) diff --git a/sdk/agrifood/azure-agrifood-farming/setup.py b/sdk/agrifood/azure-agrifood-farming/setup.py index dde5b5cc9f2f..dde9dae0c7f2 100644 --- a/sdk/agrifood/azure-agrifood-farming/setup.py +++ b/sdk/agrifood/azure-agrifood-farming/setup.py @@ -46,8 +46,8 @@ classifiers=[ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/setup.py b/sdk/anomalydetector/azure-ai-anomalydetector/setup.py index 25103f5045a8..d36eab1527c1 100644 --- a/sdk/anomalydetector/azure-ai-anomalydetector/setup.py +++ b/sdk/anomalydetector/azure-ai-anomalydetector/setup.py @@ -49,8 +49,8 @@ classifiers=[ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/sdk/attestation/azure-security-attestation/setup.py b/sdk/attestation/azure-security-attestation/setup.py index 4013012ced2f..3fcd4b47f07a 100644 --- a/sdk/attestation/azure-security-attestation/setup.py +++ b/sdk/attestation/azure-security-attestation/setup.py @@ -49,8 +49,8 @@ classifiers=[ "Development Status :: 5 - Production/Stable", "Programming Language :: Python", - "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", diff --git a/sdk/batch/azure-batch/setup.py b/sdk/batch/azure-batch/setup.py index 674898a54910..341c40f35f0b 100644 --- a/sdk/batch/azure-batch/setup.py +++ b/sdk/batch/azure-batch/setup.py @@ -46,8 +46,8 @@ classifiers=[ "Development Status :: 5 - Production/Stable", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/sdk/confidentialledger/azure-confidentialledger/setup.py b/sdk/confidentialledger/azure-confidentialledger/setup.py index c4b37f1015ac..60b3556ed7ed 100644 --- a/sdk/confidentialledger/azure-confidentialledger/setup.py +++ b/sdk/confidentialledger/azure-confidentialledger/setup.py @@ -51,8 +51,8 @@ classifiers=[ "Development Status :: 4 - Beta", "Programming Language :: Python", - "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", diff --git a/sdk/core/azure-common/setup.py b/sdk/core/azure-common/setup.py index 6374fae897ac..8e9f89bac9b9 100644 --- a/sdk/core/azure-common/setup.py +++ b/sdk/core/azure-common/setup.py @@ -45,8 +45,8 @@ classifiers=[ "Development Status :: 5 - Production/Stable", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/sdk/core/azure-core-tracing-opencensus/setup.py b/sdk/core/azure-core-tracing-opencensus/setup.py index 977e774fd48f..b3d21208122c 100644 --- a/sdk/core/azure-core-tracing-opencensus/setup.py +++ b/sdk/core/azure-core-tracing-opencensus/setup.py @@ -43,8 +43,8 @@ classifiers=[ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/sdk/core/azure-core-tracing-opentelemetry/setup.py b/sdk/core/azure-core-tracing-opentelemetry/setup.py index 5a5c5b0e84c7..5c9d77e78553 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/setup.py +++ b/sdk/core/azure-core-tracing-opentelemetry/setup.py @@ -43,8 +43,8 @@ classifiers=[ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/sdk/mixedreality/azure-mixedreality-authentication/setup.py b/sdk/mixedreality/azure-mixedreality-authentication/setup.py index 6c1bd45bd517..2080c5355aac 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/setup.py +++ b/sdk/mixedreality/azure-mixedreality-authentication/setup.py @@ -44,10 +44,9 @@ # ensure that the development status reflects the status of your package classifiers=[ "Development Status :: 4 - Beta", - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in b/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in index 4732fdf36885..82d21ff497e6 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in +++ b/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in @@ -3,4 +3,5 @@ recursive-include tests *.py *.yaml include *.md include azure/__init__.py include azure/iot/__init__.py +recursive-include samples *.py include LICENSE diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/README.md b/sdk/modelsrepository/azure-iot-modelsrepository/README.md index 8e4da19c7fc2..dd89a9a7d7fb 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/README.md +++ b/sdk/modelsrepository/azure-iot-modelsrepository/README.md @@ -1,30 +1,186 @@ -# Microsoft Azure SDK for Python +# Azure IoT Models Repository client library for Python -This is the Microsoft Azure MyService Management Client Library. -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). +The Azure IoT Models Repository Library for Python provides functionality for working with the Azure IoT Models Repository -## _Disclaimer_ +## Getting started -_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_ +### Install package -# Usage +Install the Azure IoT Models Repository library for Python with [pip][pip]: +```Shell +pip install azure-iot-modelsrepository +``` -To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt) +### Prerequisites +* A models repository following [Azure IoT conventions][repo_conventions] + * The models repository can be hosted on the local filesystem or hosted on a webserver + * Azure IoT hosts the global [Azure IoT Models Repository][global_azure_repo] which the client will use if no custom location is provided +### Publishing Models +Follow the [guide](https://docs.microsoft.com/azure/iot-pnp/concepts-model-repository#publish-a-model) to publish models to the global Azure IoT Models Repository. - -For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/) -Code samples for this package can be found at [MyService Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com. -Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples) +If using a custom local or remote repository, you can simply add your model files to a directory structure in the repository location, e.g. `dtmi/com/example/thermostat-1.json` +### Authentication +Currently, no authentication mechanisms are supported. The global endpoint is not tied to an Azure subscription and does not support authentication. All models published are meant for anonymous public consumption. -# Provide Feedback +## Key concepts -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. +The Azure IoT Models Repository enables builders to manage and share digital twin models. The models are [JSON-LD][json_ld] documents defined using the Digital Twins Definition Language ([DTDL][dtdl_spec]). +The repository defines a pattern to store DTDL interfaces in a directory structure based on the Digital Twin Model Identifier (DTMI). You can locate an interface in the repository by converting the DTMI to a relative path. For example, the DTMI `dtmi:com:example:Thermostat;1` translates to `/dtmi/com/example/thermostat-1.json`. -![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-iot-modelsrepository%2FREADME.png) +## Examples +The following sections provide several snippets covering common Models Repository tasks: +* [Initializing the ModelsRepositoryClient](#initializing-the-modelsrepositoryclient "Initializing the ModelsRepositoryClient") +* [Get Models](#modelsrepositoryclient---get-models "Get models") +* [DTMI Conventions](#dtmi-conventions "DTMI Conventions") + +### Initializing the ModelsRepositoryClient + +#### Repository Location +When no repository location is provided during instantiation, the Azure IoT Models Repository global endpoint (https://devicemodels.azure.com/) is used + +```python +client = ModelsRepositoryClient() +``` + +Alternatively, you can provide a custom location for where your repository is located via the optional `repository_location` keyword. The client accepts the following location formats: +* Web URL - e.g. `"https://contoso.com/models/"` +* Local Filesystem URI - e.g. `"file:///path/to/repository/"` +* POSIX filepath - e.g. `"/path/to/repository/"` +* Drive letter filepath - e.g. `"C:/path/to/repository/"` +```python +client = ModelsRepositoryClient(repository_location="https://contoso.com/models/") +``` + +#### Dependency Resolution Mode +The client can be configured with an optional `dependency_resolution` mode at instantiation, using one of the following values: +* `'disabled'` - The client will not resolve model dependencies +* `'enabled'` - The client will resolve any model dependencies +* `'tryFromExpanded'` - The client will attempt to resolve models using an expanded model definition (falling back on `'enabled'` mode if not possible) + +```python +client = ModelsRepositoryClient(dependency_resolution="enabled") +``` + +If the `dependency_resolution` mode is not specified: +* Clients configured for the Azure IoT Models Repository global endpoint will default to using `'tryFromExpanded'` +* Clients configured for a custom location (remote or local) will default to using `'enabled'` + +#### Additional Options +If you need to override default pipeline behavior from the [azure-core library][azure_core_docs], you can provide various [keyword arguments][azure_core_kwargs] during instantiation. + +#### Client cleanup +When you are finished with your client, make sure to call `.close()` in order to free up resources + +```python +client = ModelsRepositoryClient() +# Do things +client.close() +``` + +In order to avoid having to do this, it is recommended that you use your client from within a context manager whenever possible, which will automatically close for you +```python +with ModelsRepositoryClient() as client: + # Do things +``` + +### ModelsRepositoryClient - Get Models +Note that you must first [publish models to your repository](#publishing-models "Publishing models") before you can fetch them. The following examples assume you are using the global Azure IoT Models Repository. + +Calling `.get_models()` will fetch the model at the provided DTMI and potentially its dependencies (depending on the dependency resolution mode). It will return a `dict` that maps DTMIs to model definitions. + +```python +dtmi = "dtmi:com:example:TemperatureController;1" +with ModelsRepositoryClient() as client: + models = get_models(dtmi) +print("{} resolved in {} interfaces".format(dtmi, len(models))) +``` + +If you provide multiple DTMIs to the method, you can retrieve multiple models (and potentially their dependencies) at once +```python +dtmis = ["dtmi:com:example:TemperatureController;1", "dtmi:com:example:azuresphere:sampledevice;1"] +with ModelsRepositoryClient() as client: + models = get_models(dtmis) +print("{} resolved in {} interfaces".format(dtmi, len(models))) +``` + +By default the client will use whichever [dependency resolution mode](#dependency-resolution-mode "Dependency resolution mode") it was configured with at instantiation when retrieving models. However, this behavior can be overridden by passing any of the valid options in as an optional keyword argument to `.get_models()` + +```python +dtmi = "dtmi:com:example:TemperatureController;1" +with ModelsRepositoryClient(dependency_resolution="disabled") as client: + models = get_models(dtmi, dependency_resolution="enabled") +``` + +### DTMI Conventions +The package contains a module called `dtmi_conventions`, which, when imported provides a series of utility operations for working with DTMIs + +```python +# Returns True - this is a valid DTMI +dtmi_conventions.is_valid_dtmi("dtmi:com:example:Thermostat;1") + +# Returns False - this is NOT a valid DTMI +dtmi_conventions.is_valid_dtmi("dtmi:com:example:Thermostat") +``` + +```python +dtmi = "dtmi:com:example:Thermostat;1" + +# Local repository example +repo_uri = "file:///path/to/repository" +print(dtmi_conventions.get_model_uri(dtmi, repo_uri)) +# Prints: "file:///path/to/repository/dtmi/com/example/thermostat-1.json" +print(dtmi_conventions.get_model_uri(dtmi, repo_uri, expanded=True)) +# Prints: "file:///path/to/repository/dtmi/com/example/thermostat-1.expanded.json" + +# Remote repository example +repo_uri = "https://contoso.com/models/" +print(dtmi_conventions.get_model_uri(dtmi, repo_uri)) +# Prints: "https://contoso/com/models/dtmi/com/example/thermostat-1.json" +print(dtmi_conventions.get_model_uri(dtmi, repo_uri, expanded=True)) +# Prints: "https://contoso/com/models/dtmi/com/example/thermostat-1.expanded.json" +``` + + +## Troubleshooting + +### Logging +This library uses the standard [logging][logging_doc] library for logging. Information about HTTP sessions (URLs, headers, etc.) is logged at `DEBUG` level. + +### Exceptions +Models Repository APIs may raise exceptions defined in [azure-core][azure_core_exceptions]. + +Additionally, they may raise exceptions defined in the `azure-iot-modelsrepository`: +* `ModelError` - Indicates an error occurred while trying to parse/resolve a model definition. This generally means that there is a malformed model that does not comply with the [model DTDL specification][dtdl_spec] + +### Provide Feedback +If you encounter bugs or have suggestions, please +[open an issue](https://github.com/Azure/azure-sdk-for-python/issues). + +## Next steps + +### Samples +Additional samples are available in the [samples repository][samples_repo]. + +### Contributing +This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com. + +When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA. + +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. + + + +[azure_core_docs]: https://azuresdkdocs.blob.core.windows.net/$web/python/azure-core/latest/azure.core.html +[azure_core_exceptions]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core#azure-core-library-exceptions +[azure_core_kwargs]: https://aka.ms/azsdk/python/options +[dtdl_spec]: https://github.com/Azure/opendigitaltwins-dtdl/blob/master/DTDL/v2/dtdlv2.md +[global_azure_repo]: https://devicemodels.azure.com/ +[json_ld]: https://json-ld.org/ +[logging_doc]: https://docs.python.org/3.5/library/logging.html +[pip]: https://pypi.org/project/pip/ +[repo_conventions]: https://github.com/Azure/iot-plugandplay-models-tools/wiki +[samples_repo]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/modelsrepository/azure-iot-modelsrepository/samples/ \ No newline at end of file diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/sdk_packaging.toml b/sdk/modelsrepository/azure-iot-modelsrepository/sdk_packaging.toml index 43b62f34d13f..a40fb1ced948 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/sdk_packaging.toml +++ b/sdk/modelsrepository/azure-iot-modelsrepository/sdk_packaging.toml @@ -4,6 +4,7 @@ package_nspkg = "azure-iot-nspkg" package_pprint_name = "MyService Management" package_doc_id = "" is_stable = false -is_arm = true +is_arm = false need_msrestazure = false -need_azuremgmtcore = true +need_azuremgmtcore = false +auto_update = false diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/setup.py b/sdk/modelsrepository/azure-iot-modelsrepository/setup.py index 7216e435d93a..b8c5c2c8c377 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/setup.py +++ b/sdk/modelsrepository/azure-iot-modelsrepository/setup.py @@ -1,74 +1,66 @@ -#!/usr/bin/env python - -#------------------------------------------------------------------------- +# ------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for # license information. -#-------------------------------------------------------------------------- +# -------------------------------------------------------------------------- import re -import os.path -from io import open -from setuptools import find_packages, setup - -# Change the PACKAGE_NAME only to change folder and different name -PACKAGE_NAME = "azure-iot-modelsrepository" -PACKAGE_PPRINT_NAME = "MyService Management" +from setuptools import setup, find_packages -# a-b-c => a/b/c -package_folder_path = PACKAGE_NAME.replace('-', '/') -# a-b-c => a.b.c -namespace_name = PACKAGE_NAME.replace('-', '.') +# Fetch description +with open("README.md", "r") as fh: + _long_description = fh.read() -# 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')) - else os.path.join(package_folder_path, '_version.py'), 'r') as fd: - version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', - fd.read(), re.MULTILINE).group(1) -if not version: - raise RuntimeError('Cannot find version information') +# Fetch version +with open("azure/iot/modelsrepository/_version.py", "r") as fh: + VERSION = re.search(r"^VERSION\s=\s*[\"']([^\"']*)", fh.read(), re.MULTILINE).group(1) +if not VERSION: + raise RuntimeError("Cannot find version information") -with open('README.md', encoding='utf-8') as f: - readme = f.read() -with open('CHANGELOG.md', encoding='utf-8') as f: - changelog = f.read() setup( - name=PACKAGE_NAME, - version=version, - description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), - long_description=readme + '\n\n' + changelog, - long_description_content_type='text/markdown', - license='MIT License', - author='Microsoft Corporation', - author_email='azpysdkhelp@microsoft.com', - url='https://github.com/Azure/azure-sdk-for-python', - keywords="azure, azure sdk", # update with search keywords relevant to the azure service / product + name="azure-iot-modelsrepository", + version=VERSION, + description="Microsoft Azure IoT Models Repository Library", + license="MIT License", + author="Microsoft Corporation", + author_email="azpysdkhelp@microsoft.com", + url="https://github.com/Azure/azure-sdk-for-python", + project_urls={ + "Bug Tracker": "https://github.com/Azure/azure-sdk-for-python/issues", + "Source": "https://github.com/Azure/azure-sdk-for-python", + }, + long_description=_long_description, + long_description_content_type="text/markdown", 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', + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Topic :: Software Development :: Libraries :: Python Modules", + "License :: OSI Approved :: MIT License", + "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", ], - zip_safe=False, - packages=find_packages(exclude=[ - 'tests', - # Exclude packages that will be covered by PEP420 or nspkg - 'azure', - 'azure.iot', - ]), install_requires=[ - 'msrest>=0.6.21', - 'azure-common~=1.1', - 'azure-mgmt-core>=1.3.0,<2.0.0', + "azure-core<2.0.0,>=1.2.2", + "six>=1.11.0", ], - python_requires=">=3.6" -) + python_requires=">=3.6", + packages=find_packages( + exclude=[ + "tests", + "tests.*", + "samples", + "samples.*", + # Exclude packages that will be covered by PEP420 or nspkg + "azure", + "azure.iot", + ] + ), + zip_safe=False, +) \ 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 260c9d54f688..5207079b0bf8 100644 --- a/sdk/purview/azure-purview-administration/setup.py +++ b/sdk/purview/azure-purview-administration/setup.py @@ -46,8 +46,8 @@ classifiers=[ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/sdk/purview/azure-purview-scanning/setup.py b/sdk/purview/azure-purview-scanning/setup.py index 5bcb6cd34704..acf4cdfc8533 100644 --- a/sdk/purview/azure-purview-scanning/setup.py +++ b/sdk/purview/azure-purview-scanning/setup.py @@ -46,8 +46,8 @@ classifiers=[ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py b/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py index ba1e7f3a7355..2cc0a13820ed 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py @@ -40,10 +40,9 @@ # ensure that the development status reflects the status of your package classifiers=[ "Development Status :: 4 - Beta", - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 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/videoanalyzer/azure-media-videoanalyzer-edge/setup.py b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.py index 93319b7117d9..dd36c853f82d 100644 --- a/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.py +++ b/sdk/videoanalyzer/azure-media-videoanalyzer-edge/setup.py @@ -46,8 +46,8 @@ classifiers=[ "Development Status :: 4 - Beta", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', From 4748208b4e64f7e7bc4b5b5728ef0cdebf5c052d Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 4 May 2022 13:56:14 -0700 Subject: [PATCH 6/9] update --- sdk/agrifood/azure-agrifood-farming/setup.py | 2 +- sdk/modelsrepository/azure-iot-modelsrepository/setup.py | 3 ++- sdk/purview/azure-purview-administration/setup.py | 2 +- sdk/purview/azure-purview-scanning/setup.py | 2 +- sdk/servicefabric/azure-servicefabric/setup.py | 2 -- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sdk/agrifood/azure-agrifood-farming/setup.py b/sdk/agrifood/azure-agrifood-farming/setup.py index dde9dae0c7f2..f9c7681ebb19 100644 --- a/sdk/agrifood/azure-agrifood-farming/setup.py +++ b/sdk/agrifood/azure-agrifood-farming/setup.py @@ -68,4 +68,4 @@ "msrest>=0.6.21", 'six>=1.11.0', ], -) \ No newline at end of file +) diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/setup.py b/sdk/modelsrepository/azure-iot-modelsrepository/setup.py index b8c5c2c8c377..01abe1ee8ec7 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/setup.py +++ b/sdk/modelsrepository/azure-iot-modelsrepository/setup.py @@ -45,6 +45,7 @@ "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", @@ -63,4 +64,4 @@ ] ), zip_safe=False, -) \ 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 5207079b0bf8..903189a0f3a9 100644 --- a/sdk/purview/azure-purview-administration/setup.py +++ b/sdk/purview/azure-purview-administration/setup.py @@ -68,4 +68,4 @@ "msrest>=0.6.21", 'six>=1.11.0', ], -) \ 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 acf4cdfc8533..880e7a02b5b0 100644 --- a/sdk/purview/azure-purview-scanning/setup.py +++ b/sdk/purview/azure-purview-scanning/setup.py @@ -68,4 +68,4 @@ "msrest>=0.6.21", 'six>=1.11.0', ], -) \ No newline at end of file +) diff --git a/sdk/servicefabric/azure-servicefabric/setup.py b/sdk/servicefabric/azure-servicefabric/setup.py index 9fb7b288f745..84165e936396 100644 --- a/sdk/servicefabric/azure-servicefabric/setup.py +++ b/sdk/servicefabric/azure-servicefabric/setup.py @@ -45,7 +45,6 @@ author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python', - keywords="azure, azure sdk", # update with search keywords relevant to the azure service / product classifiers=[ 'Development Status :: 5 - Production/Stable', 'Programming Language :: Python', @@ -67,7 +66,6 @@ install_requires=[ 'msrest>=0.6.21', 'azure-common~=1.1', - 'azure-mgmt-core>=1.3.0,<2.0.0', ], python_requires=">=3.6" ) From da6f4cf429b990c98e6b8994ebee459166a09429 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 4 May 2022 14:02:54 -0700 Subject: [PATCH 7/9] update --- sdk/agrifood/azure-agrifood-farming/CHANGELOG.md | 8 ++++++++ .../azure/agrifood/farming/_version.py | 2 +- .../azure-iot-modelsrepository/MANIFEST.in | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) 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/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/modelsrepository/azure-iot-modelsrepository/MANIFEST.in b/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in index 82d21ff497e6..9b40e341aee3 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in +++ b/sdk/modelsrepository/azure-iot-modelsrepository/MANIFEST.in @@ -1,5 +1,5 @@ include _meta.json -recursive-include tests *.py *.yaml +recursive-include tests *.py include *.md include azure/__init__.py include azure/iot/__init__.py From de185fa00cca688f8bf1814652901cc8e4cc9a92 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 4 May 2022 14:44:00 -0700 Subject: [PATCH 8/9] update --- .../azure-confidentialledger/CHANGELOG.md | 8 ++++++++ .../azure/confidentialledger/_version.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) 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/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" From 17c2a13a4f488c886518cd5f5740c6800b614e50 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 5 May 2022 11:55:00 -0700 Subject: [PATCH 9/9] ensure that the readme type is set properly --- sdk/remoterendering/azure-mixedreality-remoterendering/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py b/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py index 2cc0a13820ed..cd3132b3d91a 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py @@ -32,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',