diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/CHANGELOG.md b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/CHANGELOG.md index e9660a67a5b9..4b8713cc6c18 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/CHANGELOG.md +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/CHANGELOG.md @@ -1,6 +1,8 @@ # Release History -## 1.1.5 (Unreleased) +## 1.2.0 (Unreleased) + +This version and all future versions will require Python 3.7+. Python 2.7 and 3.6 are no longer supported. ### Bugs Fixed diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/README.md b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/README.md index f17b95a894d1..c770ae83b708 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/README.md +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/README.md @@ -9,13 +9,13 @@ Please note that this is an async library, for sync version of the Azure EventHu ## _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 ### Prerequisites -- Python 3.6 or later. +- Python 3.7 or later. - **Microsoft Azure Subscription:** To use Azure services, including Azure Event Hubs, you'll need a subscription. If you do not have an existing Azure account, you may sign up for a free trial or use your MSDN subscriber benefits when you [create an account](https://azure.microsoft.com/). - **Event Hubs namespace with an Event Hub:** To interact with Azure Event Hubs, you'll also need to have a namespace and Event Hub available. If you are not familiar with creating Azure resources, you may wish to follow the step-by-step guide for [creating an Event Hub using the Azure portal](https://docs.microsoft.com/azure/event-hubs/event-hubs-create). There, you can also find detailed instructions for using the Azure CLI, Azure PowerShell, or Azure Resource Manager (ARM) templates to create an Event Hub. diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/azure/eventhub/extensions/checkpointstoreblobaio/_version.py b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/azure/eventhub/extensions/checkpointstoreblobaio/_version.py index c98f30ac7729..93ce22d3eead 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/azure/eventhub/extensions/checkpointstoreblobaio/_version.py +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/azure/eventhub/extensions/checkpointstoreblobaio/_version.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. # ------------------------------------ -VERSION = "1.1.4" +VERSION = "1.2.0" diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/samples/README.md b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/samples/README.md index 947766bd02b8..14eb9845059c 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/samples/README.md +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/samples/README.md @@ -18,7 +18,7 @@ These sample programs show how to use the async Python client libraries for Azur | [receive_events_using_checkpoint_store_storage_api_version_async.py](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/samples/receive_events_using_checkpoint_store_storage_api_version_async.py) | Demonstrates how to use a specific Azure Storage Blobs API version with BlobCheckpointStore. | ## Prerequisites -- Python2.7, Python 3.6 or later. +- Python 3.7 or later. - **Microsoft Azure Subscription:** To use Azure services, including Azure Event Hubs, you'll need a subscription. If you do not have an existing Azure account, you may sign up for a free trial or use your MSDN subscriber benefits when you [create an account](https://azure.microsoft.com/). - **Event Hubs namespace with an Event Hub:** To interact with Azure Event Hubs, you'll also need to have a namespace and Event Hub available. If you are not familiar with creating Azure resources, you may wish to follow the step-by-step guide for [creating an Event Hub using the Azure portal](https://docs.microsoft.com/azure/event-hubs/event-hubs-create). There, you can also find detailed instructions for using the Azure CLI, Azure PowerShell, or Azure Resource Manager (ARM) templates to create an Event Hub. diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.cfg b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.cfg deleted file mode 100644 index 68c61a226596..000000000000 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=0 \ No newline at end of file diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.py b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.py index c4339d9f2b54..b607d220c741 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.py +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.py @@ -55,8 +55,7 @@ classifiers=[ "Development Status :: 5 - Production/Stable", 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', @@ -65,7 +64,7 @@ ], zip_safe=False, packages=find_packages(exclude=exclude_packages), - python_requires=">=3.6", + python_requires=">=3.7", install_requires=[ # dependencies for the vendored storage blob "azure-core<2.0.0,>=1.20.1", @@ -74,12 +73,5 @@ # end of dependencies for the vendored storage blob 'azure-eventhub<6.0.0,>=5.0.0', 'aiohttp<4.0,>=3.0', - ], - extras_require={ - # dependencies for the vendored storage blob - ":python_version<'3.0'": ['futures'], - ":python_version<'3.4'": ['enum34>=1.0.4'], - ":python_version<'3.5'": ["typing"] - # end of dependencies for the vendored storage blob - }, + ] ) diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/CHANGELOG.md b/sdk/eventhub/azure-eventhub-checkpointstoreblob/CHANGELOG.md index 5e49c943417e..f9ed96f90c70 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/CHANGELOG.md +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob/CHANGELOG.md @@ -1,6 +1,8 @@ # Release History -## 1.1.5 (Unreleased) +## 1.2.0 (Unreleased) + +This version and all future versions will require Python 3.7+. Python 2.7 and 3.6 are no longer supported. ### Bugs Fixed diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/README.md b/sdk/eventhub/azure-eventhub-checkpointstoreblob/README.md index 62048c77692a..648b557c7bc2 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/README.md +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob/README.md @@ -9,13 +9,13 @@ Please note that this is a sync library, for async version of the Azure EventHub ## _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 ### Prerequisites -- Python2.7, Python 3.6 or later. +- Python 3.7 or later. - **Microsoft Azure Subscription:** To use Azure services, including Azure Event Hubs, you'll need a subscription. If you do not have an existing Azure account, you may sign up for a free trial or use your MSDN subscriber benefits when you [create an account](https://azure.microsoft.com/). - **Event Hubs namespace with an Event Hub:** To interact with Azure Event Hubs, you'll also need to have a namespace and Event Hub available. If you are not familiar with creating Azure resources, you may wish to follow the step-by-step guide for [creating an Event Hub using the Azure portal](https://docs.microsoft.com/azure/event-hubs/event-hubs-create). There, you can also find detailed instructions for using the Azure CLI, Azure PowerShell, or Azure Resource Manager (ARM) templates to create an Event Hub. diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/azure/eventhub/extensions/checkpointstoreblob/_version.py b/sdk/eventhub/azure-eventhub-checkpointstoreblob/azure/eventhub/extensions/checkpointstoreblob/_version.py index c98f30ac7729..93ce22d3eead 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/azure/eventhub/extensions/checkpointstoreblob/_version.py +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob/azure/eventhub/extensions/checkpointstoreblob/_version.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. # ------------------------------------ -VERSION = "1.1.4" +VERSION = "1.2.0" diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/samples/README.md b/sdk/eventhub/azure-eventhub-checkpointstoreblob/samples/README.md index 2bf7c2dc79b7..fea0de9d39fc 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/samples/README.md +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob/samples/README.md @@ -18,7 +18,7 @@ These sample programs show how to use the sync Python client libraries for Azure | [receive_events_using_checkpoint_store_storage_api_version.py](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub-checkpointstoreblob/samples/receive_events_using_checkpoint_store_storage_api_version.py) | Demonstrates how to use a specific Azure Storage Blobs API version with BlobCheckpointStore. | ## Prerequisites -- Python2.7, Python 3.6 or later. +- Python 3.7 or later. - **Microsoft Azure Subscription:** To use Azure services, including Azure Event Hubs, you'll need a subscription. If you do not have an existing Azure account, you may sign up for a free trial or use your MSDN subscriber benefits when you [create an account](https://azure.microsoft.com/). - **Event Hubs namespace with an Event Hub:** To interact with Azure Event Hubs, you'll also need to have a namespace and Event Hub available. If you are not familiar with creating Azure resources, you may wish to follow the step-by-step guide for [creating an Event Hub using the Azure portal](https://docs.microsoft.com/azure/event-hubs/event-hubs-create). There, you can also find detailed instructions for using the Azure CLI, Azure PowerShell, or Azure Resource Manager (ARM) templates to create an Event Hub. diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.cfg b/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.cfg deleted file mode 100644 index 3480374bc2f2..000000000000 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 \ No newline at end of file diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.py b/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.py index 23d44df9ee8e..8ce8af500eee 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.py +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.py @@ -55,16 +55,14 @@ 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.6', + 'Programming Language :: Python :: 3 :: Only', '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', ], + python_requires=">=3.7", zip_safe=False, packages=find_packages(exclude=exclude_packages), install_requires=[ @@ -74,12 +72,5 @@ "cryptography>=2.1.4", # end of dependencies for the vendored storage blob 'azure-eventhub<6.0.0,>=5.0.0', - ], - extras_require={ - # dependencies for the vendored storage blob - ":python_version<'3.0'": ['futures'], - ":python_version<'3.4'": ['enum34>=1.0.4'], - ":python_version<'3.5'": ["typing"] - # end of dependencies for the vendored storage blob - }, + ] ) diff --git a/sdk/eventhub/azure-eventhub/CHANGELOG.md b/sdk/eventhub/azure-eventhub/CHANGELOG.md index e8f4b60e9468..3866f6c2897e 100644 --- a/sdk/eventhub/azure-eventhub/CHANGELOG.md +++ b/sdk/eventhub/azure-eventhub/CHANGELOG.md @@ -2,6 +2,8 @@ ## 5.6.2 (Unreleased) +This version and all future versions will require Python 3.7+. Python 2.7 and 3.6 are no longer supported. + ### Features Added - Added support for fixed (linear) retry backoff: diff --git a/sdk/eventhub/azure-eventhub/README.md b/sdk/eventhub/azure-eventhub/README.md index 5c6c69cce396..a9cbf66ce63b 100644 --- a/sdk/eventhub/azure-eventhub/README.md +++ b/sdk/eventhub/azure-eventhub/README.md @@ -17,13 +17,13 @@ The Azure Event Hubs client library allows for publishing and consuming of Azure ## _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 ### Prerequisites -- Python 2.7, 3.6 or later. +- Python 3.7 or later. - **Microsoft Azure Subscription:** To use Azure services, including Azure Event Hubs, you'll need a subscription. If you do not have an existing Azure account, you may sign up for a free trial or use your MSDN subscriber benefits when you [create an account](https://account.windowsazure.com/Home/Index). @@ -63,7 +63,7 @@ protocol. There are implementations of the `TokenCredential` protocol available [azure-identity package](https://pypi.org/project/azure-identity/). The host name is of the format ``. - To use the credential types provided by `azure-identity`, please install the package: ```pip install azure-identity``` -- Additionally, to use the async API supported on Python 3.6+, you must first install an async transport, such as [`aiohttp`](https://pypi.org/project/aiohttp/): +- Additionally, to use the async API, you must first install an async transport, such as [`aiohttp`](https://pypi.org/project/aiohttp/): ```pip install aiohttp``` - When using Azure Active Directory, your principal must be assigned a role which allows access to Event Hubs, such as the Azure Event Hubs Data Owner role. For more information about using Azure Active Directory authorization with Event Hubs, diff --git a/sdk/eventhub/azure-eventhub/conftest.py b/sdk/eventhub/azure-eventhub/conftest.py index 84a4bc1eefac..802b99d429f9 100644 --- a/sdk/eventhub/azure-eventhub/conftest.py +++ b/sdk/eventhub/azure-eventhub/conftest.py @@ -21,13 +21,7 @@ from devtools_testutils import get_region_override -# Ignore async tests for Python < 3.5 collect_ignore = [] -if sys.version_info < (3, 5): - collect_ignore.append("tests/livetest/asynctests") - collect_ignore.append("tests/unittest/asynctests") - collect_ignore.append("features") - collect_ignore.append("samples/async_samples") PARTITION_COUNT = 2 CONN_STR = "Endpoint=sb://{}/;SharedAccessKeyName={};SharedAccessKey={};EntityPath={}" RES_GROUP_PREFIX = "eh-res-group" diff --git a/sdk/eventhub/azure-eventhub/dev_requirements.txt b/sdk/eventhub/azure-eventhub/dev_requirements.txt index f878c6e418ed..345881542ec4 100644 --- a/sdk/eventhub/azure-eventhub/dev_requirements.txt +++ b/sdk/eventhub/azure-eventhub/dev_requirements.txt @@ -3,6 +3,6 @@ -e ../../identity/azure-identity -e ../azure-mgmt-eventhub -e ../../resources/azure-mgmt-resource -aiohttp>=3.0; python_version >= '3.5' +aiohttp>=3.0 -e ../../../tools/azure-devtools -e ../../servicebus/azure-servicebus \ No newline at end of file diff --git a/sdk/eventhub/azure-eventhub/samples/README.md b/sdk/eventhub/azure-eventhub/samples/README.md index ee2f272fe048..961fa59eebe4 100644 --- a/sdk/eventhub/azure-eventhub/samples/README.md +++ b/sdk/eventhub/azure-eventhub/samples/README.md @@ -11,7 +11,7 @@ urlFragment: eventhub-samples # Azure Event Hubs client library for Python Samples These are code samples that show common scenario operations with the Azure Event Hubs client library. -Both [sync version](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub/samples/sync_samples) and [async version](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub/samples/async_samples) of samples are provided, async samples require Python 3.6 or later. +Both [sync version](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub/samples/sync_samples) and [async version](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub/samples/async_samples) of samples are provided, async samples require Python 3.7 or later. - [client_creation.py](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub/samples/sync_samples/client_creation.py) ([async version](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub/samples/async_samples/client_creation_async.py)) - Examples to create EventHubProducerClient and EventHubConsumerClient: - From a connection string @@ -81,7 +81,7 @@ Both [sync version](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/ - Receive messages and parse the body according to the body type. ## Prerequisites -- Python 2.7, 3.6 or later. +- Python 3.7 or later. - **Microsoft Azure Subscription:** To use Azure services, including Azure Event Hubs, you'll need a subscription. If you do not have an existing Azure account, you may sign up for a free trial or use your MSDN subscriber benefits when you [create an account](https://account.windowsazure.com/Home/Index). diff --git a/sdk/eventhub/azure-eventhub/samples/sample_dev_requirements.txt b/sdk/eventhub/azure-eventhub/samples/sample_dev_requirements.txt index 1f546dd19488..1fe63a3bd091 100644 --- a/sdk/eventhub/azure-eventhub/samples/sample_dev_requirements.txt +++ b/sdk/eventhub/azure-eventhub/samples/sample_dev_requirements.txt @@ -1,2 +1,2 @@ azure-eventhub-checkpointstoreblob -azure-eventhub-checkpointstoreblob-aio; python_version >= '3.6' \ No newline at end of file +azure-eventhub-checkpointstoreblob-aio \ No newline at end of file diff --git a/sdk/eventhub/azure-eventhub/setup.cfg b/sdk/eventhub/azure-eventhub/setup.cfg deleted file mode 100644 index 3480374bc2f2..000000000000 --- a/sdk/eventhub/azure-eventhub/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 \ No newline at end of file diff --git a/sdk/eventhub/azure-eventhub/setup.py b/sdk/eventhub/azure-eventhub/setup.py index 4990b8119cc2..dc5a7573f899 100644 --- a/sdk/eventhub/azure-eventhub/setup.py +++ b/sdk/eventhub/azure-eventhub/setup.py @@ -57,24 +57,18 @@ 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.6', + 'Programming Language :: Python :: 3 :: Only', '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', ], + python_requires=">=3.7", zip_safe=False, packages=find_packages(exclude=exclude_packages), install_requires=[ "azure-core<2.0.0,>=1.14.0", "uamqp>=1.4.3,<2.0.0", - ], - extras_require={ - ":python_version<'3.0'": ['azure-nspkg'], - ":python_version<'3.5'": ["typing"], - } + ] )