Skip to content

Commit

Permalink
fix: use version.py instead of pkg_resources.get_distribution (#80)
Browse files Browse the repository at this point in the history
* fix: use version.py instead of pkg_resources.get_distribution
  • Loading branch information
crwilcox committed Oct 5, 2020
1 parent ae658b6 commit d480d97
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
5 changes: 2 additions & 3 deletions google/api_core/__init__.py
Expand Up @@ -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__
4 changes: 3 additions & 1 deletion google/api_core/client_info.py
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
@@ -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"
7 changes: 6 additions & 1 deletion setup.py
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

0 comments on commit d480d97

Please sign in to comment.