Skip to content
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

Jump to bottom

fix: use version.py for versioning, avoid issues with discovering version via get_distribution #288

Merged
merged 7 commits into from Oct 6, 2020
+21 −6
Merged

fix: use version.py for versioning, avoid issues with discovering version via get_distribution #288

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1837b6
fix: harden version data gathering against DistributionNotFound
crwilcox Oct 6, 2020
798e227
fix: lint
crwilcox Oct 6, 2020
4e73155
fix: create version.py for package versioning
crwilcox Oct 6, 2020
b426197
fix: commit missing file
crwilcox Oct 6, 2020
a05e164
fix: lint
crwilcox Oct 6, 2020
adb2d1b
Merge branch 'master' into guard-get-distribution
crwilcox Oct 6, 2020
be7866d
Merge branch 'master' into guard-get-distribution
tseaver Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions google/cloud/storage/__init__.py
View file
Open in desktop
Expand Up @@ -31,10 +31,12 @@
machine).
"""

import pkg_resources

from pkg_resources import get_distribution

__version__ = get_distribution("google-cloud-storage").version
try:
__version__ = pkg_resources.get_distribution("google-cloud-storage").version
except pkg_resources.DistributionNotFound:
__version__ = None
crwilcox marked this conversation as resolved.
Show resolved Hide resolved

from google.cloud.storage.batch import Batch
from google.cloud.storage.blob import Blob
Expand Down