From 5e233313abf85ebf7c7b8bb96fcf215e7d302771 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Mon, 5 Oct 2020 16:05:31 -0700 Subject: [PATCH 1/5] fix: use version.py instead of pkg_resources.get_distribution --- google/cloud/datastore/__init__.py | 5 +---- google/cloud/datastore/client.py | 2 +- .../datastore_admin_v1/gapic/datastore_admin_client.py | 9 ++++----- google/cloud/datastore_v1/gapic/datastore_client.py | 5 ++--- setup.py | 6 +++++- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/google/cloud/datastore/__init__.py b/google/cloud/datastore/__init__.py index 078180f5..c188e1b9 100644 --- a/google/cloud/datastore/__init__.py +++ b/google/cloud/datastore/__init__.py @@ -55,10 +55,7 @@ """ -from pkg_resources import get_distribution - -__version__ = get_distribution("google-cloud-datastore").version - +from google.cloud.datastore.version import __version__ from google.cloud.datastore.batch import Batch from google.cloud.datastore.client import Client from google.cloud.datastore.entity import Entity diff --git a/google/cloud/datastore/client.py b/google/cloud/datastore/client.py index 71a0327e..86e513a8 100644 --- a/google/cloud/datastore/client.py +++ b/google/cloud/datastore/client.py @@ -21,7 +21,7 @@ from google.cloud._helpers import _LocalStack from google.cloud._helpers import _determine_default_project as _base_default_project from google.cloud.client import ClientWithProject -from google.cloud.datastore import __version__ +from google.cloud.datastore.version import __version__ from google.cloud.datastore import helpers from google.cloud.datastore._http import HTTPDatastoreAPI from google.cloud.datastore.batch import Batch diff --git a/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py b/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py index d275eca1..e90b4529 100644 --- a/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py +++ b/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py @@ -17,7 +17,6 @@ """Accesses the google.datastore.admin.v1 DatastoreAdmin API.""" import functools -import pkg_resources import warnings from google.oauth2 import service_account @@ -43,10 +42,10 @@ from google.longrunning import operations_pb2 from google.protobuf import empty_pb2 - -_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution( - "google-cloud-datastore", -).version +version = {} +with open("../../datastore/version.py") as fp: + exec(fp.read(), version) +_GAPIC_LIBRARY_VERSION = version["__version__"] class DatastoreAdminClient(object): diff --git a/google/cloud/datastore_v1/gapic/datastore_client.py b/google/cloud/datastore_v1/gapic/datastore_client.py index 5f9b530f..ac61c12b 100644 --- a/google/cloud/datastore_v1/gapic/datastore_client.py +++ b/google/cloud/datastore_v1/gapic/datastore_client.py @@ -36,11 +36,10 @@ from google.cloud.datastore_v1.proto import datastore_pb2_grpc from google.cloud.datastore_v1.proto import entity_pb2 from google.cloud.datastore_v1.proto import query_pb2 +from google.cloud.datastore.version import __version__ -_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution( - "google-cloud-datastore", -).version +_GAPIC_LIBRARY_VERSION = __version__ class DatastoreClient(object): diff --git a/setup.py b/setup.py index a0c3fd75..65047b15 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,11 @@ name = "google-cloud-datastore" description = "Google Cloud Datastore API client library" -version = "1.15.1" +version = {} +with open("google/cloud/datastore/version.py") as fp: + exec(fp.read(), version) +version = version["__version__"] + # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' From 22315c73bb3bc629179348ff697baeb8c1588035 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Mon, 5 Oct 2020 16:15:30 -0700 Subject: [PATCH 2/5] fix: add missing file --- google/cloud/datastore/version.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 google/cloud/datastore/version.py diff --git a/google/cloud/datastore/version.py b/google/cloud/datastore/version.py new file mode 100644 index 00000000..622b910d --- /dev/null +++ b/google/cloud/datastore/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.15.1" From 7cf274c141309b379be68163311198165947d211 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Mon, 5 Oct 2020 16:20:15 -0700 Subject: [PATCH 3/5] fix: add comment to clarify exec-ing of version.py in datastore_admin_client.py --- google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py b/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py index e90b4529..2ccd7f79 100644 --- a/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py +++ b/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py @@ -42,6 +42,8 @@ from google.longrunning import operations_pb2 from google.protobuf import empty_pb2 +# To avoid importing datastore into admin (which would result in a +# circular dependency), We exec to get the version via a dict. version = {} with open("../../datastore/version.py") as fp: exec(fp.read(), version) From 0da52322eafe43a9357ba355b849688307e23805 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Tue, 6 Oct 2020 09:59:46 -0700 Subject: [PATCH 4/5] fix: use full path --- .../datastore_admin_v1/gapic/datastore_admin_client.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py b/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py index 2ccd7f79..59ec335e 100644 --- a/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py +++ b/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py @@ -17,6 +17,7 @@ """Accesses the google.datastore.admin.v1 DatastoreAdmin API.""" import functools +import os import warnings from google.oauth2 import service_account @@ -44,9 +45,12 @@ # To avoid importing datastore into admin (which would result in a # circular dependency), We exec to get the version via a dict. +dir_path = os.path.abspath(os.path.dirname(__file__)) + version = {} -with open("../../datastore/version.py") as fp: +with open(os.path.join(dir_path,"../../datastore/version.py")) as fp: exec(fp.read(), version) + _GAPIC_LIBRARY_VERSION = version["__version__"] From 6b9336f688c8086d2443cca2a42a179ef91493d3 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Tue, 6 Oct 2020 10:23:54 -0700 Subject: [PATCH 5/5] chore: lint --- .../cloud/datastore_admin_v1/gapic/datastore_admin_client.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py b/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py index 59ec335e..ffb2b030 100644 --- a/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py +++ b/google/cloud/datastore_admin_v1/gapic/datastore_admin_client.py @@ -46,9 +46,8 @@ # To avoid importing datastore into admin (which would result in a # circular dependency), We exec to get the version via a dict. dir_path = os.path.abspath(os.path.dirname(__file__)) - version = {} -with open(os.path.join(dir_path,"../../datastore/version.py")) as fp: +with open(os.path.join(dir_path, "../../datastore/version.py")) as fp: exec(fp.read(), version) _GAPIC_LIBRARY_VERSION = version["__version__"]