googleapis · dhermes · Oct 4, 2016 · Oct 4, 2016
diff --git a/bigquery/MANIFEST.in b/bigquery/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/bigquery/requirements.txt b/bigquery/requirements.txt
@@ -0,0 +1 @@
+google-cloud-core >= 0.20.0
diff --git a/bigquery/setup.py b/bigquery/setup.py
@@ -49,9 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-bigquery',

diff --git a/bigtable/MANIFEST.in b/bigtable/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/bigtable/requirements.txt b/bigtable/requirements.txt
@@ -0,0 +1,2 @@
+google-cloud-core >= 0.20.0
+grpcio >= 1.0.0, < 2.0dev
diff --git a/bigtable/setup.py b/bigtable/setup.py
@@ -49,10 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-    'grpcio >= 1.0.0, < 2.0dev',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-bigtable',

diff --git a/core/MANIFEST.in b/core/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/core/requirements.txt b/core/requirements.txt
@@ -0,0 +1,5 @@
+httplib2 >= 0.9.1
+googleapis-common-protos >= 1.3.4
+oauth2client >= 3.0.0, < 4.0.0dev
+protobuf >= 3.0.0
+six
diff --git a/core/setup.py b/core/setup.py
@@ -49,13 +49,12 @@
 }


-REQUIREMENTS = [
-    'httplib2 >= 0.9.1',
-    'googleapis-common-protos >= 1.3.4',
-    'oauth2client >= 3.0.0, < 4.0.0dev',
-    'protobuf >= 3.0.0',
-    'six',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-core',

diff --git a/datastore/MANIFEST.in b/datastore/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/datastore/requirements.txt b/datastore/requirements.txt
@@ -0,0 +1,2 @@
+google-cloud-core >= 0.20.0
+grpcio >= 1.0.0, < 2.0dev
diff --git a/datastore/setup.py b/datastore/setup.py
@@ -49,10 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-    'grpcio >= 1.0.0, < 2.0dev',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-datastore',

diff --git a/dns/MANIFEST.in b/dns/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/dns/requirements.txt b/dns/requirements.txt
@@ -0,0 +1 @@
+google-cloud-core >= 0.20.0
diff --git a/dns/setup.py b/dns/setup.py
@@ -49,9 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-dns',

diff --git a/error_reporting/MANIFEST.in b/error_reporting/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/error_reporting/requirements.txt b/error_reporting/requirements.txt
@@ -0,0 +1,2 @@
+google-cloud-core >= 0.20.0
+google-cloud-logging >= 0.20.0
diff --git a/error_reporting/setup.py b/error_reporting/setup.py
@@ -49,10 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-    'google-cloud-logging >= 0.20.0',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-error-reporting',

diff --git a/language/MANIFEST.in b/language/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/language/requirements.txt b/language/requirements.txt
@@ -0,0 +1 @@
+google-cloud-core >= 0.20.0
diff --git a/language/setup.py b/language/setup.py
@@ -49,9 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-language',

diff --git a/logging/MANIFEST.in b/logging/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/logging/requirements.txt b/logging/requirements.txt
@@ -0,0 +1,5 @@
+google-cloud-core >= 0.20.0
+grpcio >= 1.0.0, < 2.0dev
+google-gax >= 0.14.1, < 0.15dev
+gapic-google-logging-v2 >= 0.10.1, < 0.11dev
+grpc-google-logging-v2 >= 0.10.1, < 0.11dev
diff --git a/logging/setup.py b/logging/setup.py
@@ -49,13 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-    'grpcio >= 1.0.0, < 2.0dev',
-    'google-gax >= 0.14.1, < 0.15dev',
-    'gapic-google-logging-v2 >= 0.10.1, < 0.11dev',
-    'grpc-google-logging-v2 >= 0.10.1, < 0.11dev',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-logging',

diff --git a/monitoring/MANIFEST.in b/monitoring/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/monitoring/requirements.txt b/monitoring/requirements.txt
@@ -0,0 +1 @@
+google-cloud-core >= 0.20.0
diff --git a/monitoring/setup.py b/monitoring/setup.py
@@ -49,9 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-monitoring',

diff --git a/pubsub/MANIFEST.in b/pubsub/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/pubsub/requirements.txt b/pubsub/requirements.txt
@@ -0,0 +1,5 @@
+google-cloud-core >= 0.20.0
+grpcio >= 1.0.0, < 2.0dev
+google-gax >= 0.14.1, < 0.15dev
+gapic-google-pubsub-v1 >= 0.10.1, < 0.11dev
+grpc-google-pubsub-v1 >= 0.10.1, < 0.11dev
diff --git a/pubsub/setup.py b/pubsub/setup.py
@@ -49,13 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-    'grpcio >= 1.0.0, < 2.0dev',
-    'google-gax >= 0.14.1, < 0.15dev',
-    'gapic-google-pubsub-v1 >= 0.10.1, < 0.11dev',
-    'grpc-google-pubsub-v1 >= 0.10.1, < 0.11dev',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-pubsub',

diff --git a/resource_manager/MANIFEST.in b/resource_manager/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/resource_manager/requirements.txt b/resource_manager/requirements.txt
@@ -0,0 +1 @@
+google-cloud-core >= 0.20.0
diff --git a/resource_manager/setup.py b/resource_manager/setup.py
@@ -49,9 +49,12 @@
 }


-REQUIREMENTS = [
-    'google-cloud-core >= 0.20.0',
-]
+# NOTE: This assumes that no comments or other extra text
+#       is in the requirements.txt file.
+with open(os.path.join(PACKAGE_ROOT, 'requirements.txt')) as file_obj:
+    REQUIREMENTS = file_obj.read()
+    REQUIREMENTS = REQUIREMENTS.strip().split('\n')
+

 setup(
    name='google-cloud-resource-manager',

diff --git a/scripts/generate_json_docs.py b/scripts/generate_json_docs.py
@@ -26,6 +26,7 @@
 from parinx.errors import MethodParsingException
 import six

+from script_utils import PROJECT_ROOT
 from verify_included_modules import get_public_modules


@@ -601,7 +602,7 @@ def main():
    parser.add_argument('--tag', help='The version of the documentation.',
                        default='master')
    parser.add_argument('--basepath', help='Path to the library.',
-                        default=os.path.join(os.path.dirname(__file__), '..'))
+                        default=PROJECT_ROOT)
    parser.add_argument('--show-toc', help='Prints partial table of contents',
                        default=False)
    args = parser.parse_args()
@@ -635,18 +636,17 @@ def main():
        }
    }

-    BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-    BASE_JSON_DOCS_DIR = os.path.join(BASE_DIR, 'docs', 'json')
+    BASE_JSON_DOCS_DIR = os.path.join(PROJECT_ROOT, 'docs', 'json')

-    DOCS_BUILD_DIR = os.path.join(BASE_DIR, 'docs', '_build')
+    DOCS_BUILD_DIR = os.path.join(PROJECT_ROOT, 'docs', '_build')
    JSON_DOCS_DIR = os.path.join(DOCS_BUILD_DIR, 'json', args.tag)
    LIB_DIR = os.path.abspath(args.basepath)

    library_dir = os.path.join(LIB_DIR, 'google', 'cloud')
    public_mods = get_public_modules(library_dir,
                                     base_package='google.cloud')

-    generate_module_docs(public_mods, JSON_DOCS_DIR, BASE_DIR, toc)
+    generate_module_docs(public_mods, JSON_DOCS_DIR, PROJECT_ROOT, toc)
    generate_doc_types_json(public_mods,
                            os.path.join(JSON_DOCS_DIR, 'types.json'))
    package_files(JSON_DOCS_DIR, DOCS_BUILD_DIR, BASE_JSON_DOCS_DIR)

diff --git a/scripts/make_datastore_grpc.py b/scripts/make_datastore_grpc.py
@@ -20,13 +20,13 @@
 import sys
 import tempfile

+from script_utils import PROJECT_ROOT

-ROOT_DIR = os.path.abspath(
-    os.path.join(os.path.dirname(__file__), '..'))
-PROTOS_DIR = os.path.join(ROOT_DIR, 'googleapis-pb')
+
+PROTOS_DIR = os.path.join(PROJECT_ROOT, 'googleapis-pb')
 PROTO_PATH = os.path.join(PROTOS_DIR, 'google', 'datastore',
                          'v1', 'datastore.proto')
-GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'datastore',
+GRPC_ONLY_FILE = os.path.join(PROJECT_ROOT, 'datastore',
                              'google', 'cloud', 'datastore',
                              '_generated', 'datastore_grpc_pb2.py')
 GRPCIO_VIRTUALENV = os.getenv('GRPCIO_VIRTUALENV')

diff --git a/scripts/run_pylint.py b/scripts/run_pylint.py
@@ -30,6 +30,7 @@
 import sys

 from script_utils import get_affected_files
+from script_utils import PROJECT_ROOT


 IGNORED_DIRECTORIES = [
@@ -44,7 +45,7 @@
    os.path.join('google', 'cloud', '__init__.py'),
    'setup.py',
 ]
-SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
+SCRIPTS_DIR = os.path.join(PROJECT_ROOT, 'scripts')
 PRODUCTION_RC = os.path.join(SCRIPTS_DIR, 'pylintrc_default')
 TEST_RC = os.path.join(SCRIPTS_DIR, 'pylintrc_reduced')
 TEST_DISABLED_MESSAGES = [
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		google-cloud-core >= 0.20.0
		grpcio >= 1.0.0, < 2.0dev
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		google-cloud-core >= 0.20.0
		google-cloud-logging >= 0.20.0