Skip to content

Commit c815421

Browse files
authored
fix: harden version data gathering against DistributionNotFound (#150)
1 parent 34384e4 commit c815421

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed

google/cloud/bigtable/__init__.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
"""Google Cloud Bigtable API package."""
1616

1717

18-
from pkg_resources import get_distribution
18+
import pkg_resources
19+
20+
try:
21+
__version__ = pkg_resources.get_distribution("google-cloud-bigtable").version
22+
except pkg_resources.DistributionNotFound:
23+
__version__ = None
1924

20-
__version__ = get_distribution("google-cloud-bigtable").version
2125

2226
from google.cloud.bigtable.client import Client
2327

google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@
4949
from google.protobuf import field_mask_pb2
5050

5151

52-
_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
53-
"google-cloud-bigtable",
54-
).version
52+
try:
53+
_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
54+
"google-cloud-bigtable"
55+
).version
56+
except pkg_resources.DistributionNotFound:
57+
_GAPIC_LIBRARY_VERSION = None
5558

5659

5760
class BigtableInstanceAdminClient(object):

google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,14 @@
5454
from google.protobuf import field_mask_pb2
5555

5656

57-
_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
58-
"google-cloud-bigtable",
59-
).version
57+
import pkg_resources
58+
59+
try:
60+
_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
61+
"google-cloud-bigtable"
62+
).version
63+
except pkg_resources.DistributionNotFound:
64+
_GAPIC_LIBRARY_VERSION = None
6065

6166

6267
class BigtableTableAdminClient(object):

google/cloud/bigtable_v2/gapic/bigtable_client.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,12 @@
3636
from google.cloud.bigtable_v2.proto import data_pb2
3737

3838

39-
_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
40-
"google-cloud-bigtable",
41-
).version
39+
try:
40+
_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
41+
"google-cloud-bigtable"
42+
).version
43+
except pkg_resources.DistributionNotFound:
44+
_GAPIC_LIBRARY_VERSION = None
4245

4346

4447
class BigtableClient(object):

0 commit comments

Comments
 (0)