Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

batch dropping 2.7 #24295

Merged
merged 10 commits into from
May 5, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion sdk/agrifood/azure-agrifood-farming/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
kristapratico marked this conversation as resolved.
Show resolved Hide resolved
- 3.6 or later - [Install Python][python]

### Install the package

Expand Down
2 changes: 1 addition & 1 deletion sdk/agrifood/azure-agrifood-farming/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
../../core/azure-core
-e ../../identity/azure-identity
../../nspkg/azure-agrifood-nspkg
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0
xiangyan99 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 0 additions & 2 deletions sdk/agrifood/azure-agrifood-farming/setup.cfg

This file was deleted.

24 changes: 3 additions & 21 deletions sdk/agrifood/azure-agrifood-farming/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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*[\'"]([^\'"]*)[\'"]',
Expand All @@ -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,
Expand All @@ -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'],
}
)
15 changes: 0 additions & 15 deletions sdk/agrifood/azure-agrifood-farming/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 2 additions & 0 deletions sdk/anomalydetector/azure-ai-anomalydetector/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions sdk/anomalydetector/azure-ai-anomalydetector/README.md
Original file line number Diff line number Diff line change
@@ -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).
Expand 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)
2 changes: 0 additions & 2 deletions sdk/anomalydetector/azure-ai-anomalydetector/setup.cfg

This file was deleted.

10 changes: 4 additions & 6 deletions sdk/anomalydetector/azure-ai-anomalydetector/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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'],
}
)
2 changes: 2 additions & 0 deletions sdk/attestation/azure-security-attestation/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sdk/attestation/azure-security-attestation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions sdk/attestation/azure-security-attestation/setup.cfg

This file was deleted.

24 changes: 3 additions & 21 deletions sdk/attestation/azure-security-attestation/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand All @@ -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"],
},
)
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion sdk/batch/azure-batch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions sdk/batch/azure-batch/setup.cfg

This file was deleted.

27 changes: 5 additions & 22 deletions sdk/batch/azure-batch/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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*[\'"]([^\'"]*)[\'"]',
Expand All @@ -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,
Expand All @@ -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'],
}
)
Original file line number Diff line number Diff line change
Expand Up @@ -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
kristapratico marked this conversation as resolved.
Show resolved Hide resolved
* 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.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
-e ../../../tools/azure-devtools
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0
2 changes: 0 additions & 2 deletions sdk/confidentialledger/azure-confidentialledger/setup.cfg

This file was deleted.

14 changes: 3 additions & 11 deletions sdk/confidentialledger/azure-confidentialledger/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
# with "azure-<yourpackagename>". 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"

Expand Down Expand Up @@ -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,
Expand All @@ -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"],
}
)
Original file line number Diff line number Diff line change
@@ -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")
Loading