From 5689be5c2e89ba5097d555cf37472d1b87e7a772 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 27 Sep 2016 18:35:55 -0700 Subject: [PATCH] Install a fake local `grpc-google-iam-v1` to resolve the version conflict. --- docs/requirements.txt | 1 + grpc-google-iam-v1-fake/README.rst | 5 +++ grpc-google-iam-v1-fake/google/__init__.py | 20 +++++++++++ .../google/iam/__init__.py | 20 +++++++++++ grpc-google-iam-v1-fake/setup.py | 36 +++++++++++++++++++ scripts/run_pylint.py | 1 + 6 files changed, 83 insertions(+) create mode 100644 grpc-google-iam-v1-fake/README.rst create mode 100644 grpc-google-iam-v1-fake/google/__init__.py create mode 100644 grpc-google-iam-v1-fake/google/iam/__init__.py create mode 100644 grpc-google-iam-v1-fake/setup.py diff --git a/docs/requirements.txt b/docs/requirements.txt index 90e321eccb4b..c231afcb440d 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -13,3 +13,4 @@ speech/ storage/ translate/ vision/ +grpc-google-iam-v1-fake/ diff --git a/grpc-google-iam-v1-fake/README.rst b/grpc-google-iam-v1-fake/README.rst new file mode 100644 index 000000000000..4854a31a33d5 --- /dev/null +++ b/grpc-google-iam-v1-fake/README.rst @@ -0,0 +1,5 @@ +gRPC library for google-iam-v1 + +grpc-google-iam-v1 is the IDL-derived library for the google-iam (v1) service in the googleapis_ repository. + +.. _`googleapis`: https://github.com/googleapis/googleapis/tree/master/google/iam/v1 diff --git a/grpc-google-iam-v1-fake/google/__init__.py b/grpc-google-iam-v1-fake/google/__init__.py new file mode 100644 index 000000000000..b2b833373882 --- /dev/null +++ b/grpc-google-iam-v1-fake/google/__init__.py @@ -0,0 +1,20 @@ +# Copyright 2016 Google Inc. +# +# 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. + +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/grpc-google-iam-v1-fake/google/iam/__init__.py b/grpc-google-iam-v1-fake/google/iam/__init__.py new file mode 100644 index 000000000000..b2b833373882 --- /dev/null +++ b/grpc-google-iam-v1-fake/google/iam/__init__.py @@ -0,0 +1,20 @@ +# Copyright 2016 Google Inc. +# +# 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. + +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/grpc-google-iam-v1-fake/setup.py b/grpc-google-iam-v1-fake/setup.py new file mode 100644 index 000000000000..d01aae91c086 --- /dev/null +++ b/grpc-google-iam-v1-fake/setup.py @@ -0,0 +1,36 @@ +import setuptools + +from setuptools import find_packages +from setuptools import setup + +install_requires = [ + 'grpcio>=1.0.0, <2.0.0', + 'googleapis-common-protos[grpc]>=1.3.4, <2.0.0' +] + +setuptools.setup( + name='grpc-google-iam-v1', + version='0.10.0', + author='Google Inc', + author_email='googleapis-packages@google.com', + classifiers=[ + 'Intended Audience :: Developers', + 'Development Status :: 3 - Alpha', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: Apache Software License', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: Implementation :: CPython', + ], + description='GRPC library for the google-iam-v1 service', + long_description=open('README.rst').read(), + install_requires=install_requires, + license='Apache-2.0', + packages=find_packages(), + namespace_packages=['google', 'google.iam', ], + url='https://github.com/googleapis/googleapis' +) diff --git a/scripts/run_pylint.py b/scripts/run_pylint.py index 9c3a515b4851..d4471c152303 100644 --- a/scripts/run_pylint.py +++ b/scripts/run_pylint.py @@ -33,6 +33,7 @@ IGNORED_DIRECTORIES = [ os.path.join('bigtable', 'google', 'cloud', 'bigtable', '_generated'), os.path.join('datastore', 'google', 'cloud', 'datastore', '_generated'), + 'grpc-google-iam-v1-fake', ] IGNORED_FILES = [ os.path.join('docs', 'conf.py'),