From f5a269b0f2b9c8e310580cf12f4a5d7b75b97f24 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Tue, 6 Oct 2020 12:37:00 -0700 Subject: [PATCH 1/2] fix: harden version data gathering against DistributionNotFound --- google/cloud/firestore_v1/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/google/cloud/firestore_v1/__init__.py b/google/cloud/firestore_v1/__init__.py index 79d96c3ddc..8debb56870 100644 --- a/google/cloud/firestore_v1/__init__.py +++ b/google/cloud/firestore_v1/__init__.py @@ -18,9 +18,12 @@ """Python idiomatic client for Google Cloud Firestore.""" -from pkg_resources import get_distribution -__version__ = get_distribution("google-cloud-firestore").version +import pkg_resources +try: + __version__ = pkg_resources.get_distribution("google-cloud-firestore").version +except pkg_resources.DistributionNotFound: + __version__ = None from google.cloud.firestore_v1 import types from google.cloud.firestore_v1._helpers import GeoPoint From 38e9034bd35768c1aa9292cc1cce23b5413b21b1 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Tue, 6 Oct 2020 12:59:07 -0700 Subject: [PATCH 2/2] fix: lint --- google/cloud/firestore_v1/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/google/cloud/firestore_v1/__init__.py b/google/cloud/firestore_v1/__init__.py index 8debb56870..e6100331a4 100644 --- a/google/cloud/firestore_v1/__init__.py +++ b/google/cloud/firestore_v1/__init__.py @@ -20,6 +20,7 @@ import pkg_resources + try: __version__ = pkg_resources.get_distribution("google-cloud-firestore").version except pkg_resources.DistributionNotFound: