From cb13bd8718a487427e66cbd3324e170da2163025 Mon Sep 17 00:00:00 2001 From: yijxie Date: Fri, 14 Feb 2020 11:23:21 -0800 Subject: [PATCH 1/5] Increment version --- .../azure-eventhub-checkpointstoreblob-aio/CHANGELOG.md | 2 ++ .../eventhub/extensions/checkpointstoreblobaio/_version.py | 2 +- sdk/eventhub/azure-eventhub-checkpointstoreblob/CHANGELOG.md | 2 ++ .../azure/eventhub/extensions/checkpointstoreblob/_version.py | 2 +- sdk/eventhub/azure-eventhub/CHANGELOG.md | 2 ++ sdk/eventhub/azure-eventhub/azure/eventhub/_version.py | 2 +- 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/CHANGELOG.md b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/CHANGELOG.md index 8e929a30f01f..4d6010a3249a 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/CHANGELOG.md +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/CHANGELOG.md @@ -1,5 +1,7 @@ # Release History +## 1.0.1 (Unreleased) + ## 1.0.0 (2020-01-13) Stable release. No new features or API changes. 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 8eedef9ba349..010063f9dd93 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.0.0" +VERSION = "1.0.1" diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/CHANGELOG.md b/sdk/eventhub/azure-eventhub-checkpointstoreblob/CHANGELOG.md index 2498f3200d83..bbae3dace509 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/CHANGELOG.md +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob/CHANGELOG.md @@ -1,5 +1,7 @@ # Release History +## 1.0.1 (Unreleased) + ## 1.0.0 (2020-01-13) Stable release. No new features or API changes. 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 8eedef9ba349..010063f9dd93 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.0.0" +VERSION = "1.0.1" diff --git a/sdk/eventhub/azure-eventhub/CHANGELOG.md b/sdk/eventhub/azure-eventhub/CHANGELOG.md index 6e48b02ca198..43675644db6b 100644 --- a/sdk/eventhub/azure-eventhub/CHANGELOG.md +++ b/sdk/eventhub/azure-eventhub/CHANGELOG.md @@ -1,5 +1,7 @@ # Release History +## 5.0.1 (Unreleased) + ## 5.0.0 (2020-01-13) **Breaking changes** diff --git a/sdk/eventhub/azure-eventhub/azure/eventhub/_version.py b/sdk/eventhub/azure-eventhub/azure/eventhub/_version.py index 7330e03f2b28..aeddf5ca4e16 100644 --- a/sdk/eventhub/azure-eventhub/azure/eventhub/_version.py +++ b/sdk/eventhub/azure-eventhub/azure/eventhub/_version.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. # ------------------------------------ -VERSION = "5.0.0" +VERSION = "5.0.1" From 38e9f65493683c04c69040b11433dd6b02017f98 Mon Sep 17 00:00:00 2001 From: yijxie Date: Fri, 14 Feb 2020 11:23:39 -0800 Subject: [PATCH 2/5] Update Development Status --- sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.py | 2 +- sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.py b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.py index 0b13ff1bbb0f..88f1fd79f107 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.py +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/setup.py @@ -53,7 +53,7 @@ author_email='azpysdkhelp@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio', classifiers=[ - 'Development Status :: 3 - Alpha', + 'Development Status :: 5 - Production/Stable', 'Programming Language :: Python', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.py b/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.py index a6bbf648336d..40f6e926ed84 100644 --- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.py +++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob/setup.py @@ -53,7 +53,7 @@ author_email='azpysdkhelp@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub-checkpointstoreblob', classifiers=[ - 'Development Status :: 3 - Alpha', + 'Development Status :: 5 - Production/Stable', 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', From fcbaf65ae5f4ead7635c4595d67f5281f98ecded Mon Sep 17 00:00:00 2001 From: yijxie Date: Mon, 9 Mar 2020 15:44:12 -0700 Subject: [PATCH 3/5] Remove typing.Deque for Py3.5.3 --- sdk/eventhub/azure-eventhub/azure/eventhub/_consumer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/eventhub/azure-eventhub/azure/eventhub/_consumer.py b/sdk/eventhub/azure-eventhub/azure/eventhub/_consumer.py index b5e58ae6e803..6203ae636201 100644 --- a/sdk/eventhub/azure-eventhub/azure/eventhub/_consumer.py +++ b/sdk/eventhub/azure-eventhub/azure/eventhub/_consumer.py @@ -7,7 +7,7 @@ import uuid import logging from collections import deque -from typing import TYPE_CHECKING, Callable, Dict, Optional, Any, Deque +from typing import TYPE_CHECKING, Callable, Dict, Optional, Any import uamqp from uamqp import types, errors, utils @@ -120,7 +120,7 @@ def __init__(self, client, source, **kwargs): self._track_last_enqueued_event_properties = ( track_last_enqueued_event_properties ) - self._message_buffer = deque() # type: Deque[uamqp.Message] + self._message_buffer = deque() # type: ignore self._last_received_event = None # type: Optional[EventData] def _create_handler(self, auth): From 9f69130efabd507c8eb4f56163cb42f3cbf8005b Mon Sep 17 00:00:00 2001 From: yijxie Date: Thu, 30 Apr 2020 22:34:45 -0700 Subject: [PATCH 4/5] Fix a bug of sync owner_level --- .../azure/eventhub/_eventprocessor/event_processor.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sdk/eventhub/azure-eventhub/azure/eventhub/_eventprocessor/event_processor.py b/sdk/eventhub/azure-eventhub/azure/eventhub/_eventprocessor/event_processor.py index 1d322ff03751..634ed955d3a5 100644 --- a/sdk/eventhub/azure-eventhub/azure/eventhub/_eventprocessor/event_processor.py +++ b/sdk/eventhub/azure-eventhub/azure/eventhub/_eventprocessor/event_processor.py @@ -74,9 +74,8 @@ def __init__( self._partition_close_handler = kwargs.get( "on_partition_close", None ) # type: Optional[Callable[[PartitionContext, CloseReason], None]] - self._checkpoint_store = kwargs.get( - "checkpoint_store" - ) or InMemoryCheckpointStore() # type: Optional[CheckpointStore] + checkpoint_store = kwargs.get("checkpoint_store") # type: Optional[CheckpointStore] + self._checkpoint_store = checkpoint_store or InMemoryCheckpointStore() self._initial_event_position = kwargs.get( "initial_event_position", "@latest" ) # type: Union[str, int, datetime, Dict[str, Any]] @@ -93,7 +92,7 @@ def __init__( # Receive parameters self._owner_level = kwargs.get("owner_level", None) # type: Optional[int] - if "checkpoint_store" in kwargs and self._owner_level is None: + if checkpoint_store and self._owner_level is None: self._owner_level = 0 self._prefetch = kwargs.get("prefetch", None) # type: Optional[int] self._track_last_enqueued_event_properties = kwargs.get( From 3a171c5037def951e21076e80680aff046d6d1fe Mon Sep 17 00:00:00 2001 From: yijxie Date: Fri, 1 May 2020 11:35:14 -0700 Subject: [PATCH 5/5] Allow live test to proceed if fail to import azure identity --- .../azure-eventhub/tests/livetest/synctests/test_auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/eventhub/azure-eventhub/tests/livetest/synctests/test_auth.py b/sdk/eventhub/azure-eventhub/tests/livetest/synctests/test_auth.py index 4df5040c8b29..aba361ed645f 100644 --- a/sdk/eventhub/azure-eventhub/tests/livetest/synctests/test_auth.py +++ b/sdk/eventhub/azure-eventhub/tests/livetest/synctests/test_auth.py @@ -14,7 +14,7 @@ def test_client_secret_credential(aad_credential, live_eventhub): try: from azure.identity import EnvironmentCredential - except ImportError as e: + except: pytest.skip("No azure identity library") credential = EnvironmentCredential() producer_client = EventHubProducerClient(fully_qualified_namespace=live_eventhub['hostname'],