From d480d97e41cd6705325b3b649360553a83c23f47 Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Mon, 5 Oct 2020 12:06:00 -0700 Subject: [PATCH 1/2] fix: use version.py instead of pkg_resources.get_distribution (#80) * fix: use version.py instead of pkg_resources.get_distribution --- google/api_core/__init__.py | 5 ++--- google/api_core/client_info.py | 4 +++- google/api_core/version.py | 15 +++++++++++++++ setup.py | 7 ++++++- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 google/api_core/version.py diff --git a/google/api_core/__init__.py b/google/api_core/__init__.py index c762e183..605dd8be 100644 --- a/google/api_core/__init__.py +++ b/google/api_core/__init__.py @@ -17,7 +17,6 @@ This package contains common code and utilties used by Google client libraries. """ -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__ diff --git a/google/api_core/client_info.py b/google/api_core/client_info.py index b196b7a9..6c04d5de 100644 --- a/google/api_core/client_info.py +++ b/google/api_core/client_info.py @@ -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 diff --git a/google/api_core/version.py b/google/api_core/version.py new file mode 100644 index 00000000..f49e5331 --- /dev/null +++ b/google/api_core/version.py @@ -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" diff --git a/setup.py b/setup.py index e1189664..a35121e0 100644 --- a/setup.py +++ b/setup.py @@ -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' From 339b07dcd98ec392c1043b6f1d4c14ec51ed541b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 5 Oct 2020 12:50:04 -0700 Subject: [PATCH 2/2] chore: release 1.22.4 (#84) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ google/api_core/version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80c8979b..aea8373a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-api-core/#history +### [1.22.4](https://www.github.com/googleapis/python-api-core/compare/v1.22.3...v1.22.4) (2020-10-05) + + +### Bug Fixes + +* use version.py instead of pkg_resources.get_distribution ([#80](https://www.github.com/googleapis/python-api-core/issues/80)) ([d480d97](https://www.github.com/googleapis/python-api-core/commit/d480d97e41cd6705325b3b649360553a83c23f47)) + ### [1.22.3](https://www.github.com/googleapis/python-api-core/compare/v1.22.2...v1.22.3) (2020-10-02) diff --git a/google/api_core/version.py b/google/api_core/version.py index f49e5331..bce5ed4f 100644 --- a/google/api_core/version.py +++ b/google/api_core/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.22.3" +__version__ = "1.22.4"