From 0d799b026bd6fdc613a83c36b9f47bd82efcd4c8 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 23 Feb 2022 11:36:38 -0800 Subject: [PATCH 1/3] patching conda version to current. removing pin of azure-mgmt-resources --- eng/conda_env.yml | 2 +- eng/conda_test_requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/conda_env.yml b/eng/conda_env.yml index 4c674de246a3..b432e880cdbb 100644 --- a/eng/conda_env.yml +++ b/eng/conda_env.yml @@ -1,2 +1,2 @@ variables: - AZURESDK_CONDA_VERSION: '2021.05.01b1' + AZURESDK_CONDA_VERSION: '2021.12.01' diff --git a/eng/conda_test_requirements.txt b/eng/conda_test_requirements.txt index 78d7ca62136e..b359bbbf5b7c 100644 --- a/eng/conda_test_requirements.txt +++ b/eng/conda_test_requirements.txt @@ -1,5 +1,4 @@ # install from root of repo -azure-mgmt-resource==20.0.0 aiohttp>=3.0; python_version >= '3.5' tools/azure-devtools tools/azure-sdk-tools From 7299a67bb4cf8a61eae59f4815fabe4ff9057b38 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 3 May 2022 14:41:48 -0700 Subject: [PATCH 2/3] template package now py27 only --- sdk/template/azure-template/setup.cfg | 2 -- sdk/template/azure-template/setup.py | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 sdk/template/azure-template/setup.cfg diff --git a/sdk/template/azure-template/setup.cfg b/sdk/template/azure-template/setup.cfg deleted file mode 100644 index 3c6e79cf31da..000000000000 --- a/sdk/template/azure-template/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 diff --git a/sdk/template/azure-template/setup.py b/sdk/template/azure-template/setup.py index d7cc14974d21..975a6f5492dd 100644 --- a/sdk/template/azure-template/setup.py +++ b/sdk/template/azure-template/setup.py @@ -43,8 +43,6 @@ 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.6", "Programming Language :: Python :: 3.7", @@ -65,9 +63,7 @@ install_requires=[ "azure-core<2.0.0,>=1.10.0", ], - extras_require={ - ":python_version<'3.0'": ["azure-nspkg"], - }, + python_requires=">=3.6", project_urls={ "Bug Reports": "https://github.com/Azure/azure-sdk-for-python/issues", "Source": "https://github.com/Azure/azure-sdk-python", From d1ac4f13e09f06e92ea977d69b198806c6533a17 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 3 May 2022 15:45:20 -0700 Subject: [PATCH 3/3] updating classifiers --- sdk/template/azure-template/setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/template/azure-template/setup.py b/sdk/template/azure-template/setup.py index 975a6f5492dd..892133bc9278 100644 --- a/sdk/template/azure-template/setup.py +++ b/sdk/template/azure-template/setup.py @@ -43,11 +43,13 @@ 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", ], packages=find_packages(