Skip to content

Commit d480d97

Browse files
authored
fix: use version.py instead of pkg_resources.get_distribution (#80)
* fix: use version.py instead of pkg_resources.get_distribution
1 parent ae658b6 commit d480d97

File tree

4 files changed

+26
-5
lines changed

4 files changed

+26
-5
lines changed

google/api_core/__init__.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
This package contains common code and utilties used by Google client libraries.
1818
"""
1919

20-
from pkg_resources import get_distribution
20+
from google.api_core import version as api_core_version
2121

22-
23-
__version__ = get_distribution("google-api-core").version
22+
__version__ = api_core_version.__version__

google/api_core/client_info.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222

2323
import pkg_resources
2424

25+
from google.api_core import version as api_core_version
26+
2527
_PY_VERSION = platform.python_version()
26-
_API_CORE_VERSION = pkg_resources.get_distribution("google-api-core").version
28+
_API_CORE_VERSION = api_core_version.__version__
2729

2830
try:
2931
_GRPC_VERSION = pkg_resources.get_distribution("grpcio").version

google/api_core/version.py

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright 2020 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
__version__ = "1.22.3"

setup.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222

2323
name = "google-api-core"
2424
description = "Google API client core library"
25-
version = "1.22.3"
25+
26+
version = {}
27+
with open("google/api_core/version.py") as fp:
28+
exec(fp.read(), version)
29+
version = version['__version__']
30+
2631
# Should be one of:
2732
# 'Development Status :: 3 - Alpha'
2833
# 'Development Status :: 4 - Beta'

0 commit comments

Comments
 (0)