fix: harden version data gathering against DistributionNotFound (#150)

googleapis · Oct 6, 2020 · c815421 · c815421
1 parent 34384e4
commit c815421
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/google/cloud/bigtable/__init__.py b/google/cloud/bigtable/__init__.py
@@ -15,9 +15,13 @@
 """Google Cloud Bigtable API package."""
 
 
-from pkg_resources import get_distribution
+import pkg_resources
+
+try:
+    __version__ = pkg_resources.get_distribution("google-cloud-bigtable").version
+except pkg_resources.DistributionNotFound:
+    __version__ = None
 
-__version__ = get_distribution("google-cloud-bigtable").version
 
 from google.cloud.bigtable.client import Client
 

diff --git a/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client.py b/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client.py
@@ -49,9 +49,12 @@
 from google.protobuf import field_mask_pb2
 
 
-_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
-    "google-cloud-bigtable",
-).version
+try:
+    _GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
+        "google-cloud-bigtable"
+    ).version
+except pkg_resources.DistributionNotFound:
+    _GAPIC_LIBRARY_VERSION = None
 
 
 class BigtableInstanceAdminClient(object):

diff --git a/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client.py b/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client.py
@@ -54,9 +54,14 @@
 from google.protobuf import field_mask_pb2
 
 
-_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
-    "google-cloud-bigtable",
-).version
+import pkg_resources
+
+try:
+    _GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
+        "google-cloud-bigtable"
+    ).version
+except pkg_resources.DistributionNotFound:
+    _GAPIC_LIBRARY_VERSION = None
 
 
 class BigtableTableAdminClient(object):

diff --git a/google/cloud/bigtable_v2/gapic/bigtable_client.py b/google/cloud/bigtable_v2/gapic/bigtable_client.py
@@ -36,9 +36,12 @@
 from google.cloud.bigtable_v2.proto import data_pb2
 
 
-_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
-    "google-cloud-bigtable",
-).version
+try:
+    _GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
+        "google-cloud-bigtable"
+    ).version
+except pkg_resources.DistributionNotFound:
+    _GAPIC_LIBRARY_VERSION = None
 
 
 class BigtableClient(object):