Skip to content

chore: tweak version lookup for non-admin client #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 2 commits into from
Nov 17, 2020
Merged

chore: tweak version lookup for non-admin client #165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0f9878
chore: tweak version lookup for non-admin client
tseaver Nov 12, 2020
2d703ef
chore: note replacments to be removed w/ move to microgenerator
tseaver Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion synth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@
s.move(library / "google/cloud/bigtable_admin_v2")
s.move(library / "tests")

# Work around non-standard installations
# ----------------------------------------------------------------------------
# Work around non-standard installations (missing setuptools).
#
# These replacements can be removed after migrating to the microgenerator,
# which will generate them directly.
# ----------------------------------------------------------------------------

admin_clients = [
"google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client.py",
Expand All @@ -69,6 +74,23 @@
"""
)

s.replace(
"google/cloud/bigtable_v2/gapic/bigtable_client.py",
"""\
_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: # pragma: NO COVER
_GAPIC_LIBRARY_VERSION = None
"""
)

# ----------------------------------------------------------------------------
# Add templated files
# ----------------------------------------------------------------------------
Expand Down