From b4fcfbda0f194b46433c4e7799b9a2a8314a454e Mon Sep 17 00:00:00 2001 From: Thomas Schultz Date: Mon, 26 Sep 2016 22:03:55 -0400 Subject: [PATCH 1/3] Just add storage as a POC for #2395. --- .gitignore | 1 + setup.py | 24 +----------------------- setup_base/__init__.py | 0 setup_base/base.py | 22 ++++++++++++++++++++++ storage/MANIFEST.in | 1 + storage/setup.py | 24 +----------------------- 6 files changed, 26 insertions(+), 46 deletions(-) create mode 100644 setup_base/__init__.py create mode 100644 setup_base/base.py diff --git a/.gitignore b/.gitignore index 8e4001cb4b12..989189d267d9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.egg *.egg-info dist +*/setup_base build eggs parts diff --git a/setup.py b/setup.py index 626949569ed3..3ad09ee4c0b7 100644 --- a/setup.py +++ b/setup.py @@ -25,29 +25,7 @@ # NOTE: This is duplicated throughout and we should try to # consolidate. -SETUP_BASE = { - 'author': 'Google Cloud Platform', - 'author_email': 'jjg+google-cloud-python@google.com', - 'scripts': [], - 'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python', - 'license': 'Apache 2.0', - 'platforms': 'Posix; MacOS X; Windows', - 'include_package_data': True, - 'zip_safe': False, - 'classifiers': [ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Topic :: Internet', - ], -} - +from setup_base import SETUP_BASE REQUIREMENTS = [ 'google-cloud-bigquery >= 0.20.0', diff --git a/setup_base/__init__.py b/setup_base/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/setup_base/base.py b/setup_base/base.py new file mode 100644 index 000000000000..d0a9a76c167a --- /dev/null +++ b/setup_base/base.py @@ -0,0 +1,22 @@ +SETUP_BASE = { + 'author': 'Google Cloud Platform', + 'author_email': 'jjg+google-cloud-python@google.com', + 'scripts': [], + 'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python', + 'license': 'Apache 2.0', + 'platforms': 'Posix; MacOS X; Windows', + 'include_package_data': True, + 'zip_safe': False, + 'classifiers': [ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: Apache Software License', + 'Operating System :: OS Independent', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Topic :: Internet', + ], +} diff --git a/storage/MANIFEST.in b/storage/MANIFEST.in index cb3a2b9ef4fa..5e64ef0ab79a 100644 --- a/storage/MANIFEST.in +++ b/storage/MANIFEST.in @@ -1,4 +1,5 @@ include README.rst graft google +include ../setup_base.py graft unit_tests global-exclude *.pyc diff --git a/storage/setup.py b/storage/setup.py index 3632105ff6f9..084b8591cfeb 100644 --- a/storage/setup.py +++ b/storage/setup.py @@ -25,29 +25,7 @@ # NOTE: This is duplicated throughout and we should try to # consolidate. -SETUP_BASE = { - 'author': 'Google Cloud Platform', - 'author_email': 'jjg+google-cloud-python@google.com', - 'scripts': [], - 'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python', - 'license': 'Apache 2.0', - 'platforms': 'Posix; MacOS X; Windows', - 'include_package_data': True, - 'zip_safe': False, - 'classifiers': [ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Topic :: Internet', - ], -} - +from setup_base.base import SETUP_BASE REQUIREMENTS = [ 'google-cloud-core >= 0.20.0', From 884df10e02843d7b998dd359467fc3d6a9be9363 Mon Sep 17 00:00:00 2001 From: Thomas Schultz Date: Tue, 27 Sep 2016 18:16:35 -0400 Subject: [PATCH 2/3] Delete storage setup_base. --- storage/setup.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/storage/setup.py b/storage/setup.py index 084b8591cfeb..e11311f7dc1f 100644 --- a/storage/setup.py +++ b/storage/setup.py @@ -17,6 +17,13 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) From 436d7d7573443b40d5c64b322107d0887755a4d6 Mon Sep 17 00:00:00 2001 From: Thomas Schultz Date: Tue, 27 Sep 2016 18:34:12 -0400 Subject: [PATCH 3/3] Manual copy approach. --- .gitignore | 1 + bigquery/setup.py | 8 ++++++++ bigtable/setup.py | 8 ++++++++ core/setup.py | 8 ++++++++ datastore/setup.py | 8 ++++++++ dns/setup.py | 8 ++++++++ error_reporting/setup.py | 8 ++++++++ language/setup.py | 8 ++++++++ logging/setup.py | 8 ++++++++ monitoring/setup.py | 8 ++++++++ pubsub/setup.py | 8 ++++++++ resource_manager/setup.py | 8 ++++++++ storage/setup.py | 1 + translate/setup.py | 8 ++++++++ vision/setup.py | 8 ++++++++ 15 files changed, 106 insertions(+) diff --git a/.gitignore b/.gitignore index 989189d267d9..960f9a36a89e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ # Packages *.egg *.egg-info +*/setup_base dist */setup_base build diff --git a/bigquery/setup.py b/bigquery/setup.py index a54bfd655f48..35fcfc870bd0 100644 --- a/bigquery/setup.py +++ b/bigquery/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/bigtable/setup.py b/bigtable/setup.py index 6c36042e9484..dddf031c688c 100644 --- a/bigtable/setup.py +++ b/bigtable/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/core/setup.py b/core/setup.py index 3926ddbd7d4c..f38be4cff2f0 100644 --- a/core/setup.py +++ b/core/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/datastore/setup.py b/datastore/setup.py index 17052a272044..5103b4210730 100644 --- a/datastore/setup.py +++ b/datastore/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/dns/setup.py b/dns/setup.py index ca6107dae1a8..69609b9bc69b 100644 --- a/dns/setup.py +++ b/dns/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/error_reporting/setup.py b/error_reporting/setup.py index 6b98eb55cf19..6f9bec1f9eff 100644 --- a/error_reporting/setup.py +++ b/error_reporting/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/language/setup.py b/language/setup.py index 7e3907123362..627e929676f3 100644 --- a/language/setup.py +++ b/language/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/logging/setup.py b/logging/setup.py index 8fbd52fafa0f..c453255ce445 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/monitoring/setup.py b/monitoring/setup.py index 0fcbbc379d02..a2a62a321f2a 100644 --- a/monitoring/setup.py +++ b/monitoring/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/pubsub/setup.py b/pubsub/setup.py index e4e142594bcf..353688a2a50d 100644 --- a/pubsub/setup.py +++ b/pubsub/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/resource_manager/setup.py b/resource_manager/setup.py index 063b4dcbd16f..c77917d05700 100644 --- a/resource_manager/setup.py +++ b/resource_manager/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/storage/setup.py b/storage/setup.py index e11311f7dc1f..b50bad1e8a95 100644 --- a/storage/setup.py +++ b/storage/setup.py @@ -23,6 +23,7 @@ copytree('../setup_base', './setup_base') except: pass + from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/translate/setup.py b/translate/setup.py index c135b122e920..87e2f6d99573 100644 --- a/translate/setup.py +++ b/translate/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) diff --git a/vision/setup.py b/vision/setup.py index 59e8cec8c67f..51d3340cff05 100644 --- a/vision/setup.py +++ b/vision/setup.py @@ -17,6 +17,14 @@ from setuptools import find_packages from setuptools import setup +from shutil import copytree + +try: + copytree('../setup_base', './setup_base') +except: + pass + +from setup_base.base import SETUP_BASE PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))