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.

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 #80

Merged
merged 5 commits into from
Oct 5, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
3 changes: 2 additions & 1 deletion google/api_core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@

from pkg_resources import get_distribution

from google.api_core import version as api_core_version

__version__ = get_distribution("google-api-core").version
__version__ = api_core_version.__version__
4 changes: 3 additions & 1 deletion google/api_core/client_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@

import pkg_resources

from google.api_core import version as api_core_version

_PY_VERSION = platform.python_version()
_API_CORE_VERSION = pkg_resources.get_distribution("google-api-core").version
_API_CORE_VERSION = api_core_version.__version__

try:
_GRPC_VERSION = pkg_resources.get_distribution("grpcio").version
Expand Down
15 changes: 15 additions & 0 deletions google/api_core/version.py
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__ = "1.22.3"
crwilcox marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@

name = "google-api-core"
description = "Google API client core library"
version = "1.22.3"

version = {}
with open("google/api_core/version.py") as fp:
exec(fp.read(), version)
version = version['__version__']

# Should be one of:
# 'Development Status :: 3 - Alpha'
# 'Development Status :: 4 - Beta'
Expand Down