Moving package requirements into requirements.txt files.

dhermes · dhermes · commit 64f0a91e7970 · 2016-10-03T20:09:15.000-07:00
Using boilerplate code snippet in each setup.py to load
the requirements.txt and adding the requirements.txt file to
MANIFEST.in file.
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/speech/MANIFEST.in b/speech/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/speech/requirements.txt b/speech/requirements.txt
@@ -0,0 +1 @@
+google-cloud-core >= 0.20.0
diff --git a/speech/setup.py b/speech/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-speech',
diff --git a/storage/MANIFEST.in b/storage/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/storage/requirements.txt b/storage/requirements.txt
@@ -0,0 +1 @@
+google-cloud-core >= 0.20.0
diff --git a/storage/setup.py b/storage/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-storage',
diff --git a/translate/MANIFEST.in b/translate/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/translate/requirements.txt b/translate/requirements.txt
@@ -0,0 +1 @@
+google-cloud-core >= 0.20.0
diff --git a/translate/setup.py b/translate/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-translate',
diff --git a/vision/MANIFEST.in b/vision/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include requirements.txt
 graft google
 graft unit_tests
 global-exclude *.pyc
diff --git a/vision/requirements.txt b/vision/requirements.txt
@@ -0,0 +1 @@
+google-cloud-core >= 0.20.0
diff --git a/vision/setup.py b/vision/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-vision',

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+google-cloud-core >= 0.20.0`
	`2`	`+grpcio >= 1.0.0, < 2.0dev`