From 4344aaddec333be5d68bb998a335eb1ce26f2e71 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Wed, 5 Jan 2022 11:44:38 +0800 Subject: [PATCH] drop py2 (#22309) --- .../template/{LICENSE.txt => LICENSE} | 8 ++++---- scripts/quickstart_tooling_llc/template/MANIFEST.in | 2 +- scripts/quickstart_tooling_llc/template/README.md | 5 +++++ .../template/dev_requirements.txt | 4 ++-- scripts/quickstart_tooling_llc/template/setup.cfg | 2 -- scripts/quickstart_tooling_llc/template/setup.py | 10 +++------- 6 files changed, 15 insertions(+), 16 deletions(-) rename scripts/quickstart_tooling_llc/template/{LICENSE.txt => LICENSE} (88%) delete mode 100644 scripts/quickstart_tooling_llc/template/setup.cfg diff --git a/scripts/quickstart_tooling_llc/template/LICENSE.txt b/scripts/quickstart_tooling_llc/template/LICENSE similarity index 88% rename from scripts/quickstart_tooling_llc/template/LICENSE.txt rename to scripts/quickstart_tooling_llc/template/LICENSE index 0313a903d76c..b2f52a2bad4e 100644 --- a/scripts/quickstart_tooling_llc/template/LICENSE.txt +++ b/scripts/quickstart_tooling_llc/template/LICENSE @@ -1,6 +1,6 @@ -The MIT License (MIT) +Copyright (c) Microsoft Corporation. -Copyright (c) 2017 Microsoft +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 @@ -12,10 +12,10 @@ 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 +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. \ No newline at end of file +SOFTWARE. diff --git a/scripts/quickstart_tooling_llc/template/MANIFEST.in b/scripts/quickstart_tooling_llc/template/MANIFEST.in index 4df14964989a..03b5966d07e5 100644 --- a/scripts/quickstart_tooling_llc/template/MANIFEST.in +++ b/scripts/quickstart_tooling_llc/template/MANIFEST.in @@ -1,6 +1,6 @@ include *.md include {{ folder_first }}/__init__.py include {{ folder_first }}/{{ folder_second }}/__init__.py -include LICENSE.txt +include LICENSE recursive-include tests *.py recursive-include samples *.py *.md \ No newline at end of file diff --git a/scripts/quickstart_tooling_llc/template/README.md b/scripts/quickstart_tooling_llc/template/README.md index 85485d4f1619..31f75dd49e18 100644 --- a/scripts/quickstart_tooling_llc/template/README.md +++ b/scripts/quickstart_tooling_llc/template/README.md @@ -1,6 +1,11 @@ # {{ package_pprint_name }} client library for Python +## _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_ + ## Getting started ### Installating the package diff --git a/scripts/quickstart_tooling_llc/template/dev_requirements.txt b/scripts/quickstart_tooling_llc/template/dev_requirements.txt index 882aec6d0619..a091a8b98313 100644 --- a/scripts/quickstart_tooling_llc/template/dev_requirements.txt +++ b/scripts/quickstart_tooling_llc/template/dev_requirements.txt @@ -3,6 +3,6 @@ ../../core/azure-core ../../identity/azure-identity ../../nspkg/{{ folder_first }}-{{ folder_second }}-nspkg -aiohttp>=3.0; python_version >= '3.5' +aiohttp>=3.0; typing_extensions>=3.7.2 -asyncio; python_version >= '3.5' +asyncio; diff --git a/scripts/quickstart_tooling_llc/template/setup.cfg b/scripts/quickstart_tooling_llc/template/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/scripts/quickstart_tooling_llc/template/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/scripts/quickstart_tooling_llc/template/setup.py b/scripts/quickstart_tooling_llc/template/setup.py index caf756fb1079..652717bbb395 100644 --- a/scripts/quickstart_tooling_llc/template/setup.py +++ b/scripts/quickstart_tooling_llc/template/setup.py @@ -43,13 +43,12 @@ classifiers=[ "Development Status :: 4 - Beta", "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "License :: OSI Approved :: MIT License", ], zip_safe=False, @@ -65,8 +64,5 @@ "msrest>=0.6.21", 'six>=1.11.0', ], - extras_require={ - ":python_version<'3.0'": ["futures", "{{ folder_first }}-{{ folder_second }}-nspkg"], - ":python_version<'3.5'": ["typing"], - }, + python_requires=">=3.7", )