Skip to content

Commit 86f6dc0

Browse files
authored
Remove references to Python 2.7 and 3.6. (Azure#22279)
1 parent dcfedb8 commit 86f6dc0

File tree

7 files changed

+10
-49
lines changed

7 files changed

+10
-49
lines changed

sdk/search/azure-search-documents/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
### Other Changes
1212

13+
- Python 2.7 and 3.6 are no longer supported. Please use Python version 3.7 or later.
14+
1315
## 11.3.0b6 (2021-11-19)
1416

1517
### Features Added

sdk/search/azure-search-documents/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Use the Azure.Search.Documents client library to:
4242

4343
## _Disclaimer_
4444

45-
_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_
45+
_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_
4646

4747
## Getting started
4848

@@ -56,7 +56,7 @@ pip install azure-search-documents
5656

5757
### Prerequisites
5858

59-
* Python 2.7, or 3.5 or later is required to use this package.
59+
* Python 3.7 or later is required to use this package.
6060
* You need an [Azure subscription][azure_sub] and a
6161
[Azure Cognitive Search service][search_resource] to use this package.
6262

@@ -304,7 +304,7 @@ print(" Category: {}".format(result["Category"]))
304304

305305

306306
### Async APIs
307-
This library includes a complete async API supported on Python 3.5+. To use it, you must
307+
This library includes a complete async API. To use it, you must
308308
first install an async transport, such as [aiohttp](https://pypi.org/project/aiohttp/).
309309
See
310310
[azure-core documentation](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/README.md#transport)

sdk/search/azure-search-documents/dev_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
-e ../../../tools/azure-sdk-tools
33
../../core/azure-core
44
../../nspkg/azure-search-nspkg
5-
aiohttp>=3.0; python_version >= '3.5'
5+
aiohttp>=3.0

sdk/search/azure-search-documents/samples/README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ products:
1010
# Samples for Azure Cognitive Search client library for Python
1111

1212
These code samples show common scenario operations with the Azure Cognitive
13-
Search client library. The async versions of the samples (the python sample
14-
files appended with `_async`) show asynchronous operations with Cognitive Search
15-
and require Python version 3.5 or later.
13+
Search client library.
1614

1715
Authenticate the client with a Azure Cognitive Search [API Key Credential](https://docs.microsoft.com/azure/search/search-security-api-keys):
1816

@@ -46,7 +44,7 @@ Then for common search index operations:
4644

4745
## Prerequisites
4846

49-
* Python 2.7, or 3.5 or later is required to use this package (3.5 or later if using asyncio)
47+
* Python 3.7 or later is required to use this package
5048
* You must have an [Azure subscription](https://azure.microsoft.com/free/)
5149
* You must create the "Hotels" sample index [in the Azure Portal](https://docs.microsoft.com/azure/search/search-get-started-portal)
5250

sdk/search/azure-search-documents/setup.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

sdk/search/azure-search-documents/setup.py

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,6 @@
2121
# a-b-c => a.b.c
2222
NAMESPACE_NAME = PACKAGE_NAME.replace("-", ".")
2323

24-
# azure v0.x is not compatible with this package
25-
# azure v0.x used to have a __version__ attribute (newer versions don't)
26-
try:
27-
import azure
28-
29-
try:
30-
ver = azure.__version__
31-
raise Exception(
32-
'This package is incompatible with azure=={}. '.format(ver) +
33-
'Uninstall it with "pip uninstall azure".'
34-
)
35-
except AttributeError:
36-
pass
37-
except ImportError:
38-
pass
39-
4024
# Version extraction inspired from 'requests'
4125
with open(os.path.join(PACKAGE_FOLDER_PATH, '_version.py'), 'r') as fd:
4226
version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
@@ -59,11 +43,8 @@
5943
classifiers=[
6044
"Development Status :: 4 - Beta",
6145
'Programming Language :: Python',
62-
'Programming Language :: Python :: 2',
63-
'Programming Language :: Python :: 2.7',
46+
'Programming Language :: Python :: 3 :: Only',
6447
'Programming Language :: Python :: 3',
65-
'Programming Language :: Python :: 3.5',
66-
'Programming Language :: Python :: 3.6',
6748
'Programming Language :: Python :: 3.7',
6849
'Programming Language :: Python :: 3.8',
6950
'Programming Language :: Python :: 3.9',
@@ -78,15 +59,11 @@
7859
'azure',
7960
'azure.search',
8061
]),
62+
python_requires=">=3.7",
8163
install_requires=[
8264
"azure-core<2.0.0,>=1.19.0",
8365
"msrest>=0.6.21",
8466
"azure-common~=1.1",
8567
"typing-extensions>=3.7.4.3"
8668
],
87-
extras_require={
88-
":python_version<'3.0'": ['futures', 'azure-search-nspkg'],
89-
":python_version<'3.4'": ['enum34>=1.0.4'],
90-
":python_version<'3.5'": ["typing"]
91-
},
9269
)

sdk/search/azure-search-documents/tests/conftest.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)