From 69dd0da9efea06092dc9a71df4867c1e7f309612 Mon Sep 17 00:00:00 2001 From: hannahrogers-google Date: Wed, 21 Apr 2021 12:43:35 -0400 Subject: [PATCH 1/2] fix: no longer crash if pubsub distribution cannot be found wqwhen extracting semver --- google/cloud/pubsub_v1/publisher/client.py | 5 ++++- google/cloud/pubsub_v1/subscriber/client.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/google/cloud/pubsub_v1/publisher/client.py b/google/cloud/pubsub_v1/publisher/client.py index fc89a2adf..c49a56178 100644 --- a/google/cloud/pubsub_v1/publisher/client.py +++ b/google/cloud/pubsub_v1/publisher/client.py @@ -36,7 +36,10 @@ from google.pubsub_v1 import types as gapic_types from google.pubsub_v1.services.publisher import client as publisher_client -__version__ = pkg_resources.get_distribution("google-cloud-pubsub").version +try: + __version__ = pkg_resources.get_distribution("google-cloud-pubsub").version +except pkg_resources.DistributionNotFound: + __version__ = "0.0" _LOGGER = logging.getLogger(__name__) diff --git a/google/cloud/pubsub_v1/subscriber/client.py b/google/cloud/pubsub_v1/subscriber/client.py index b137fbc5f..3b8f3a750 100644 --- a/google/cloud/pubsub_v1/subscriber/client.py +++ b/google/cloud/pubsub_v1/subscriber/client.py @@ -27,7 +27,10 @@ from google.pubsub_v1.services.subscriber import client as subscriber_client -__version__ = pkg_resources.get_distribution("google-cloud-pubsub").version +try: + __version__ = pkg_resources.get_distribution("google-cloud-pubsub").version +except pkg_resources.DistributionNotFound: + __version__ = "0.0" _BLACKLISTED_METHODS = ( "publish", From 73b22616a445fb1587cda7a02d02772450f478c1 Mon Sep 17 00:00:00 2001 From: hannahrogers-google Date: Wed, 21 Apr 2021 16:05:55 -0400 Subject: [PATCH 2/2] doc: add context to distribution not found exception --- google/cloud/pubsub_v1/publisher/client.py | 2 ++ google/cloud/pubsub_v1/subscriber/client.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/google/cloud/pubsub_v1/publisher/client.py b/google/cloud/pubsub_v1/publisher/client.py index c49a56178..7e6801de0 100644 --- a/google/cloud/pubsub_v1/publisher/client.py +++ b/google/cloud/pubsub_v1/publisher/client.py @@ -39,6 +39,8 @@ try: __version__ = pkg_resources.get_distribution("google-cloud-pubsub").version except pkg_resources.DistributionNotFound: + # Distribution might not be available if we are not running from within a + # PIP package. __version__ = "0.0" _LOGGER = logging.getLogger(__name__) diff --git a/google/cloud/pubsub_v1/subscriber/client.py b/google/cloud/pubsub_v1/subscriber/client.py index 3b8f3a750..376530caa 100644 --- a/google/cloud/pubsub_v1/subscriber/client.py +++ b/google/cloud/pubsub_v1/subscriber/client.py @@ -30,6 +30,8 @@ try: __version__ = pkg_resources.get_distribution("google-cloud-pubsub").version except pkg_resources.DistributionNotFound: + # Distribution might not be available if we are not running from within + # a PIP package. __version__ = "0.0" _BLACKLISTED_METHODS = (