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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: expose library version at googleapiclient.__version__ #1623

Merged
merged 2 commits into from Dec 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions googleapiclient/model.py
Expand Up @@ -26,12 +26,12 @@
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__)
Expand Down
15 changes: 15 additions & 0 deletions 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"
7 changes: 6 additions & 1 deletion setup.py
Expand Up @@ -51,7 +51,12 @@
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",
Expand Down
4 changes: 2 additions & 2 deletions tests/test_json_model.py
Expand Up @@ -25,17 +25,17 @@
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'


Expand Down