Skip to content

Commit

Permalink
[Key Vault] Drop 2.7, 3.6 support (#22367)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mccoyp
mccoyp authored Jan 6, 2022
1 parent 2b4af08 commit 9fbe42c
Show file tree
Hide file tree
Showing 22 changed files with 23 additions and 125 deletions.
1 change: 1 addition & 0 deletions sdk/keyvault/azure-keyvault-administration/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Bugs Fixed

### Other Changes
- Python 2.7 and 3.6 are no longer supported. Please use Python version 3.7 or later.

## 4.1.0b2 (2021-11-11)

Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-keyvault-administration/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ create, manage, and deploy public and private SSL/TLS certificates

## _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
### Install packages
Expand All @@ -32,7 +32,7 @@ authentication as demonstrated below.

### Prerequisites
* An [Azure subscription][azure_sub]
* Python 2.7 or a recent version of Python 3 (this library doesn't support end-of-life versions)
* Python 3.7 or later
* A [managed HSM][managed_hsm]. If you need to create one, see the final two steps in the next section for details on creating the managed HSM with the Azure CLI.

### Authenticate the client
Expand Down
8 changes: 0 additions & 8 deletions sdk/keyvault/azure-keyvault-administration/conftest.py
View file

This file was deleted.

2 changes: 1 addition & 1 deletion sdk/keyvault/azure-keyvault-administration/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
-e ../azure-keyvault-keys
-e ../azure-mgmt-keyvault
../../nspkg/azure-keyvault-nspkg
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0
azure-storage-blob==12.6.0
parameterized>=0.7.3
2 changes: 0 additions & 2 deletions sdk/keyvault/azure-keyvault-administration/setup.cfg
View file

This file was deleted.

25 changes: 2 additions & 23 deletions sdk/keyvault/azure-keyvault-administration/setup.py
View file
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__ # type: ignore
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*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) # type: ignore
Expand All @@ -61,10 +46,8 @@
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",
Expand All @@ -81,10 +64,6 @@
"azure.keyvault",
]
),
python_requires=">=3.7",
install_requires=["azure-common~=1.1", "azure-core<2.0.0,>=1.15.0", "msrest>=0.6.21", "six>=1.11.0"],
extras_require={
":python_version<'3.0'": ["azure-keyvault-nspkg"],
":python_version<'3.4'": ["enum34>=1.0.4"],
":python_version<'3.5'": ["typing"],
},
)
1 change: 1 addition & 0 deletions sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Bugs Fixed

### Other Changes
- Python 2.7 and 3.6 are no longer supported. Please use Python version 3.7 or later.

## 4.4.0b2 (2021-11-11)

Expand Down
6 changes: 3 additions & 3 deletions sdk/keyvault/azure-keyvault-certificates/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ and other secrets

## _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
### Install the package
Expand All @@ -27,7 +27,7 @@ authentication as demonstrated below.

### Prerequisites
* An [Azure subscription][azure_sub]
* Python 2.7, 3.5.3, or later
* Python 3.7 or later
* A Key Vault. If you need to create one, you can use the
[Azure Cloud Shell][azure_cloud_shell] to create one with these commands
(replace `"my-resource-group"` and `"my-key-vault"` with your own, unique
Expand Down Expand Up @@ -266,7 +266,7 @@ for certificate in certificates:
```

### Async operations
This library includes a complete async API supported on Python 3.5+. To use it, you must
This library includes a complete set of async APIs. To use them, you must
first install an async transport, such as [aiohttp](https://pypi.org/project/aiohttp/).
See
[azure-core documentation](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/CLIENT_LIBRARY_DEVELOPER.md#transport)
Expand Down
11 changes: 0 additions & 11 deletions sdk/keyvault/azure-keyvault-certificates/conftest.py
View file

This file was deleted.

2 changes: 1 addition & 1 deletion sdk/keyvault/azure-keyvault-certificates/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
-e ../../identity/azure-identity
-e ../azure-mgmt-keyvault
../../nspkg/azure-keyvault-nspkg
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0
parameterized>=0.7.3
2 changes: 0 additions & 2 deletions sdk/keyvault/azure-keyvault-certificates/setup.cfg
View file

This file was deleted.

25 changes: 2 additions & 23 deletions sdk/keyvault/azure-keyvault-certificates/setup.py
View file
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__ # type: ignore
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*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)
Expand All @@ -61,11 +46,9 @@
classifiers=[
"Development Status :: 4 - Beta",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand All @@ -82,14 +65,10 @@
"azure.keyvault",
]
),
python_requires=">=3.7",
install_requires=[
"azure-core<2.0.0,>=1.15.0",
"msrest>=0.6.21",
"azure-common~=1.1",
],
extras_require={
":python_version<'3.0'": ["azure-keyvault-nspkg"],
":python_version<'3.4'": ["enum34>=1.0.4"],
":python_version<'3.5'": ["typing"],
},
)
1 change: 1 addition & 0 deletions sdk/keyvault/azure-keyvault-keys/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Bugs Fixed

### Other Changes
- Python 2.7 and 3.6 are no longer supported. Please use Python version 3.7 or later.

## 4.5.0b5 (2021-11-11)

Expand Down
6 changes: 3 additions & 3 deletions sdk/keyvault/azure-keyvault-keys/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ create, manage, and deploy public and private SSL/TLS certificates

## _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
### Install packages
Expand All @@ -29,7 +29,7 @@ authentication as demonstrated below.

### Prerequisites
* An [Azure subscription][azure_sub]
* Python 2.7 or a recent version of Python 3 (this library doesn't support end-of-life versions)
* Python 3.7 or later
* A Key Vault. If you need to create one, you can use the
[Azure Cloud Shell][azure_cloud_shell] to create one with these commands
(replace `"my-resource-group"` and `"my-key-vault"` with your own, unique
Expand Down Expand Up @@ -310,7 +310,7 @@ See the
for more details of the cryptography API.

### Async API
This library includes a complete async API supported on Python 3. To use it, you must
This library includes a complete set of async APIs. To use them, you must
first install an async transport, such as [aiohttp](https://pypi.org/project/aiohttp/).
See
[azure-core documentation](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/CLIENT_LIBRARY_DEVELOPER.md#transport)
Expand Down
6 changes: 0 additions & 6 deletions sdk/keyvault/azure-keyvault-keys/conftest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
# Licensed under the MIT License. See LICENSE.txt in the project root for
# license information.
# -------------------------------------------------------------------------
import sys
import os

os.environ['PYTHONHASHSEED'] = '0'

# Ignore async tests for Python < 3.5
collect_ignore_glob = []
if sys.version_info < (3, 5):
collect_ignore_glob.append("tests/*_async.py")
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-keyvault-keys/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
-e ../azure-mgmt-keyvault
-e ../../../tools/azure-sdk-tools
../../nspkg/azure-keyvault-nspkg
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0
azure-identity
parameterized>=0.7.3
2 changes: 0 additions & 2 deletions sdk/keyvault/azure-keyvault-keys/setup.cfg
View file

This file was deleted.

25 changes: 2 additions & 23 deletions sdk/keyvault/azure-keyvault-keys/setup.py
View file
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__ # type: ignore
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*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)
Expand All @@ -61,10 +46,8 @@
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",
Expand All @@ -81,16 +64,12 @@
"azure.keyvault",
]
),
python_requires=">=3.7",
install_requires=[
"azure-core<2.0.0,>=1.15.0",
"cryptography>=2.1.4",
"msrest>=0.6.21",
"azure-common~=1.1",
"six>=1.12.0"
],
extras_require={
":python_version<'3.0'": ["azure-keyvault-nspkg"],
":python_version<'3.4'": ["enum34>=1.0.4"],
":python_version<'3.5'": ["typing"],
},
)
1 change: 1 addition & 0 deletions sdk/keyvault/azure-keyvault-secrets/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Bugs Fixed

### Other Changes
- Python 2.7 and 3.6 are no longer supported. Please use Python version 3.7 or later.

## 4.4.0b2 (2021-11-11)

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-keyvault-secrets/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ for secret_property in secret_properties:
```

### Async API
This library includes a complete async API supported on Python 3.5+. To use it, you must
This library includes a complete set of async APIs. To use them, you must
first install an async transport, such as [aiohttp](https://pypi.org/project/aiohttp/).
See
[azure-core documentation](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/CLIENT_LIBRARY_DEVELOPER.md#transport)
Expand Down
12 changes: 0 additions & 12 deletions sdk/keyvault/azure-keyvault-secrets/conftest.py
View file

This file was deleted.

2 changes: 1 addition & 1 deletion sdk/keyvault/azure-keyvault-secrets/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
-e ../azure-mgmt-keyvault
-e ../../../tools/azure-sdk-tools
../../nspkg/azure-keyvault-nspkg
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0
parameterized>=0.7.3

0 comments on commit 9fbe42c

Please sign in to comment.