diff options
| author | joinsion <joinsion@gmail.com> | 2021-12-13 23:43:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-13 10:43:32 -0500 |
| commit | 83db1d71395e92fb2bd814a31713bd8ba3f412ca (patch) | |
| tree | 90201e6e488a2eb08939504353eaac8658921695 | |
| parent | b8de30d82e7aec663136b786bf3ec92640e74757 (diff) | |
| download | google-api-python-client-83db1d71395e92fb2bd814a31713bd8ba3f412ca.tar.gz | |
feat: expose library version at googleapiclient.__version__ (#1623)
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
| -rw-r--r-- | googleapiclient/model.py | 4 | ||||
| -rw-r--r-- | googleapiclient/version.py | 15 | ||||
| -rw-r--r-- | setup.py | 7 | ||||
| -rw-r--r-- | tests/test_json_model.py | 4 |
4 files changed, 25 insertions, 5 deletions
diff --git a/googleapiclient/model.py b/googleapiclient/model.py index b023db4dd..3d1f39769 100644 --- a/googleapiclient/model.py +++ b/googleapiclient/model.py @@ -26,12 +26,12 @@ __author__ = "jcgregorio@google.com (Joe Gregorio)" import json import logging import platform -import pkg_resources import urllib +from googleapiclient import version as googleapiclient_version from googleapiclient.errors import HttpError -_LIBRARY_VERSION = pkg_resources.get_distribution("google-api-python-client").version +_LIBRARY_VERSION = googleapiclient_version.__version__ _PY_VERSION = platform.python_version() LOGGER = logging.getLogger(__name__) diff --git a/googleapiclient/version.py b/googleapiclient/version.py new file mode 100644 index 000000000..5b915cede --- /dev/null +++ b/googleapiclient/version.py @@ -0,0 +1,15 @@ +# Copyright 2021 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.33.0" @@ -51,7 +51,12 @@ readme_filename = os.path.join(package_root, "README.md") with io.open(readme_filename, encoding="utf-8") as readme_file: readme = readme_file.read() -version = "2.33.0" +package_root = os.path.abspath(os.path.dirname(__file__)) + +version = {} +with open(os.path.join(package_root, "googleapiclient/version.py")) as fp: + exec(fp.read(), version) +version = version["__version__"] setup( name="google-api-python-client", diff --git a/tests/test_json_model.py b/tests/test_json_model.py index 322a7b484..533361c36 100644 --- a/tests/test_json_model.py +++ b/tests/test_json_model.py @@ -25,17 +25,17 @@ __author__ = "jcgregorio@google.com (Joe Gregorio)" import io import httplib2 import json -import pkg_resources import platform import unittest import urllib import googleapiclient.model +from googleapiclient import version as googleapiclient_version from googleapiclient.errors import HttpError from googleapiclient.model import JsonModel -_LIBRARY_VERSION = pkg_resources.get_distribution("google-api-python-client").version +_LIBRARY_VERSION = googleapiclient_version.__version__ CSV_TEXT_MOCK = 'column1,column2,column3\nstring1,1.2,string2' |