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

fix: use version.py instead of pkg_resources.get_distribution #307

Merged
merged 5 commits into from
Oct 12, 2020
Merged

fix: use version.py instead of pkg_resources.get_distribution #307

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a66968
fix: use version.py instead of pkg_resources.get_distribution
HemangChothani Oct 7, 2020
435aa18
Merge branch 'master' of https://github.com/googleapis/python-bigquer…
HemangChothani Oct 8, 2020
0649797
fix: conflict resolve and relative path harden
HemangChothani Oct 9, 2020
4914fb1
fix: nit
HemangChothani Oct 12, 2020
feb355b
Merge branch 'master' of https://github.com/googleapis/python-bigquer…
HemangChothani Oct 12, 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
4 changes: 2 additions & 2 deletions google/cloud/bigquery/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"""


from pkg_resources import get_distribution
from google.cloud.bigquery import version as bigquery_version

__version__ = get_distribution("google-cloud-bigquery").version
__version__ = bigquery_version.__version__

from google.cloud.bigquery.client import Client
from google.cloud.bigquery.dataset import AccessEntry
Expand Down
15 changes: 15 additions & 0 deletions google/cloud/bigquery/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "2.1.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@crwilcox Does it make sense to set this to the next version now? Or will the release bots find this and update the version number in that PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that I release 2.1.0, maybe this is correct?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't bump this in advance. @crwilcox submitted a PR for release-please to find and bump this I believe.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. Release please will figure it out. Though you may have to close the first release it opens and force trigger. The way we find files is the index, and version.py won't exist at first 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@crwilcox version.py won't exist at first means version is black or empty string in very first time? or should i erase it from file?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HemangChothani version.py won't exist in the index of repository files. I was commenting on release infrastructure, not the source. The file should exist and the version should be the same as it was in setup.py.

6 changes: 5 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@

name = "google-cloud-bigquery"
description = "Google BigQuery API client library"
version = "2.0.0"

version = {}
with open("google/cloud/bigquery/version.py") as fp:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would edit this as I did in googleapis/python-datastore#97. The assumption of separator and relative pathing seemed a bit fragile, so I hardened it a bit.

exec(fp.read(), version)
version = version["__version__"]
# Should be one of:
# 'Development Status :: 3 - Alpha'
# 'Development Status :: 4 - Beta'
Expand Down