Merge pull request GoogleCloudPlatform#151 from GoogleCloudPlatform/use-new-psq

michaelawyu · web-flow · commit 1c8c2d3ed7ae · 2017-12-07T15:01:14.000-08:00
Update to use new psq
diff --git a/2-structured-data/requirements-dev.txt b/2-structured-data/requirements-dev.txt
@@ -1,6 +1,6 @@
 tox==2.9.1
 flake8==3.5.0
 flaky==3.4.0
-pytest==3.2.3
+pytest==3.3.1
 pytest-cov==2.5.1
 retrying==1.3.3
diff --git a/2-structured-data/requirements.txt b/2-structured-data/requirements.txt
@@ -1,9 +1,8 @@
 Flask==0.12.2
-google-cloud==0.27.0
+google-cloud-datastore==1.4.0
 gunicorn==19.7.1
-oauth2client==4.1.2
 Flask-SQLAlchemy==2.3.2
 PyMySQL==0.7.11
 Flask-PyMongo==0.5.1
-PyMongo==3.5.1
+PyMongo==3.6.0
 six==1.11.0
diff --git a/2-structured-data/tox.ini b/2-structured-data/tox.ini
@@ -1,9 +1,8 @@
 [tox]
 skipsdist = True
-envlist = lint,py27,py34
+envlist = lint,py27,py36
 
 [testenv]
-basepython = python2.7
 deps =
   -rrequirements.txt
   -rrequirements-dev.txt
@@ -12,9 +11,6 @@ commands =
 passenv = GOOGLE_APPLICATION_CREDENTIALS DATASTORE_HOST
 setenv = PYTHONPATH={toxinidir}
 
-[testenv:py34]
-basepython = python3.4
-
 [testenv:lint]
 deps =
   flake8
diff --git a/3-binary-data/config.py b/3-binary-data/config.py
@@ -32,7 +32,7 @@
 
 # Google Cloud Project ID. This can be found on the 'Overview' page at
 # https://console.developers.google.com
-PROJECT_ID = 'python-docs-samples-tests'
+PROJECT_ID = 'your-project-id'
 
 # CloudSQL & SQLAlchemy configuration
 # Replace the following values the respective values of your Cloud SQL
@@ -90,6 +90,6 @@
 #
 # You can adjust the max content length and allow extensions settings to allow
 # larger or more varied file types if desired.
-CLOUD_STORAGE_BUCKET = 'python-docs-samples-tests'
+CLOUD_STORAGE_BUCKET = 'your-bucket-name'
 MAX_CONTENT_LENGTH = 8 * 1024 * 1024
 ALLOWED_EXTENSIONS = set(['png', 'jpg', 'jpeg', 'gif'])
diff --git a/3-binary-data/requirements-dev.txt b/3-binary-data/requirements-dev.txt
@@ -1,6 +1,6 @@
 tox==2.9.1
 flake8==3.5.0
 flaky==3.4.0
-pytest==3.2.3
+pytest==3.3.1
 pytest-cov==2.5.1
 retrying==1.3.3
diff --git a/3-binary-data/requirements.txt b/3-binary-data/requirements.txt
@@ -1,9 +1,10 @@
 Flask==0.12.2
-google-cloud==0.27.0
+google-cloud-datastore==1.4.0
+google-cloud-storage==1.6.0
 gunicorn==19.7.1
 oauth2client==4.1.2
 Flask-SQLAlchemy==2.3.2
 PyMySQL==0.7.11
 Flask-PyMongo==0.5.1
-PyMongo==3.5.1
+PyMongo==3.6.0
 six==1.11.0
diff --git a/3-binary-data/tox.ini b/3-binary-data/tox.ini
@@ -1,9 +1,8 @@
 [tox]
 skipsdist = True
-envlist = lint,py27,py34
+envlist = lint,py27,py36
 
 [testenv]
-basepython = python2.7
 deps =
   -rrequirements.txt
   -rrequirements-dev.txt
@@ -12,9 +11,6 @@ commands =
 passenv = GOOGLE_APPLICATION_CREDENTIALS DATASTORE_HOST
 setenv = PYTHONPATH={toxinidir}
 
-[testenv:py34]
-basepython = python3.4
-
 [testenv:lint]
 deps =
   flake8
diff --git a/4-auth/bookshelf/__init__.py b/4-auth/bookshelf/__init__.py
@@ -17,10 +17,10 @@
 
 from flask import current_app, Flask, redirect, request, session, url_for
 import httplib2
-
 # [START include]
 from oauth2client.contrib.flask_util import UserOAuth2
 
+
 oauth2 = UserOAuth2()
 # [END include]
 
diff --git a/4-auth/requirements-dev.txt b/4-auth/requirements-dev.txt
@@ -1,7 +1,7 @@
 tox==2.9.1
 flake8==3.5.0
 flaky==3.4.0
-pytest==3.2.3
+pytest==3.3.1
 pytest-cov==2.5.1
 retrying==1.3.3
 mock==2.0.0
diff --git a/4-auth/requirements.txt b/4-auth/requirements.txt
@@ -1,9 +1,10 @@
 Flask==0.12.2
-google-cloud==0.27.0
+google-cloud-datastore==1.4.0
+google-cloud-storage==1.6.0
 gunicorn==19.7.1
 oauth2client==4.1.2
 Flask-SQLAlchemy==2.3.2
 PyMySQL==0.7.11
 Flask-PyMongo==0.5.1
-PyMongo==3.5.1
+PyMongo==3.6.0
 six==1.11.0
diff --git a/4-auth/tox.ini b/4-auth/tox.ini
@@ -1,20 +1,16 @@
 [tox]
 skipsdist = True
-envlist = lint,py27,py34
+envlist = lint,py27,py36
 
 [testenv]
-basepython = python2.7
 deps =
   -rrequirements.txt
   -rrequirements-dev.txt
 commands =
-  py.test --cov=bookshelf --no-success-flaky-report {posargs:tests}
+  py.test --cov=bookshelf --no-success-flaky-report {posargs} tests
 passenv = GOOGLE_APPLICATION_CREDENTIALS DATASTORE_HOST
 setenv = PYTHONPATH={toxinidir}
 
-[testenv:py34]
-basepython = python3.4
-
 [testenv:lint]
 deps =
   flake8
diff --git a/5-logging/requirements-dev.txt b/5-logging/requirements-dev.txt
@@ -1,7 +1,7 @@
 tox==2.9.1
 flake8==3.5.0
 flaky==3.4.0
-pytest==3.2.3
+pytest==3.3.1
 pytest-cov==2.5.1
 retrying==1.3.3
 mock==2.0.0
diff --git a/5-logging/requirements.txt b/5-logging/requirements.txt
@@ -1,9 +1,12 @@
 Flask==0.12.2
-google-cloud==0.27.0
+google-cloud-datastore==1.4.0
+google-cloud-storage==1.6.0
+google-cloud-logging==1.4.0
+google-cloud-error_reporting==0.28.0
 gunicorn==19.7.1
 oauth2client==4.1.2
 Flask-SQLAlchemy==2.3.2
 PyMySQL==0.7.11
 Flask-PyMongo==0.5.1
-PyMongo==3.5.1
+PyMongo==3.6.0
 six==1.11.0
diff --git a/5-logging/tox.ini b/5-logging/tox.ini
@@ -1,20 +1,16 @@
 [tox]
 skipsdist = True
-envlist = lint,py27,py34
+envlist = lint,py27,py36
 
 [testenv]
-basepython = python2.7
 deps =
   -rrequirements.txt
   -rrequirements-dev.txt
 commands =
-  py.test --cov=bookshelf --no-success-flaky-report {posargs:tests}
+  py.test --cov=bookshelf --no-success-flaky-report {posargs} tests
 passenv = GOOGLE_APPLICATION_CREDENTIALS DATASTORE_HOST
 setenv = PYTHONPATH={toxinidir}
 
-[testenv:py34]
-basepython = python3.4
-
 [testenv:lint]
 deps =
   flake8
diff --git a/6-pubsub/bookshelf/tasks.py b/6-pubsub/bookshelf/tasks.py
@@ -21,17 +21,21 @@
 import requests
 
 
+publisher_client = pubsub.PublisherClient()
+subscriber_client = pubsub.SubscriberClient()
+
+
 # [START get_books_queue]
 def get_books_queue():
-    client = pubsub.Client(
-        project=current_app.config['PROJECT_ID'])
+    project = current_app.config['PROJECT_ID']
 
     # Create a queue specifically for processing books and pass in the
     # Flask application context. This ensures that tasks will have access
     # to any extensions / configuration specified to the app, such as
     # models.
     return psq.Queue(
-        client, 'books', extra_context=current_app.app_context)
+        publisher_client, subscriber_client, project,
+        'books', extra_context=current_app.app_context)
 # [END get_books_queue]
 
 
diff --git a/6-pubsub/requirements-dev.txt b/6-pubsub/requirements-dev.txt
@@ -2,7 +2,7 @@ tox==2.9.1
 flake8==3.5.0
 flaky==3.4.0
 mock==2.0.0
-pytest==3.2.3
+pytest==3.3.1
 pytest-cov==2.5.1
 BeautifulSoup4==4.6.0
 requests==2.18.4
diff --git a/6-pubsub/requirements.txt b/6-pubsub/requirements.txt
@@ -1,12 +1,15 @@
 Flask==0.12.2
-google-cloud==0.27.0
+google-cloud-datastore==1.4.0
+google-cloud-storage==1.6.0
+google-cloud-logging==1.4.0
+google-cloud-error_reporting==0.28.0
 gunicorn==19.7.1
 oauth2client==4.1.2
 Flask-SQLAlchemy==2.3.2
 PyMySQL==0.7.11
 Flask-PyMongo==0.5.1
-PyMongo==3.5.1
+PyMongo==3.6.0
 six==1.11.0
 requests[security]==2.18.4
 honcho==1.0.1
-psq==0.5.0
+psq==0.6.0
diff --git a/6-pubsub/tox.ini b/6-pubsub/tox.ini
@@ -1,9 +1,8 @@
 [tox]
 skipsdist = True
-envlist = lint,py27,py34
+envlist = lint,py27,py36
 
 [testenv]
-basepython = python2.7
 deps =
   -rrequirements.txt
   -rrequirements-dev.txt
@@ -12,16 +11,14 @@ commands =
 passenv = GOOGLE_APPLICATION_CREDENTIALS DATASTORE_HOST E2E_URL
 setenv = PYTHONPATH={toxinidir}
 
-[testenv:py34]
-basepython = python3.4
 
 [testenv:py27-e2e]
 basepython = python2.7
 commands =
   py.test --no-success-flaky-report -m "e2e" {posargs: tests}
 
-[testenv:py34-e2e]
-basepython = python2.7
+[testenv:py36-e2e]
+basepython = python3.6
 commands =
   py.test --no-success-flaky-report -m "e2e" {posargs: tests}
 
diff --git a/7-gce/bookshelf/tasks.py b/7-gce/bookshelf/tasks.py
@@ -21,16 +21,20 @@
 import requests
 
 
+publisher_client = pubsub.PublisherClient()
+subscriber_client = pubsub.SubscriberClient()
+
+
 def get_books_queue():
-    client = pubsub.Client(
-        project=current_app.config['PROJECT_ID'])
+    project = current_app.config['PROJECT_ID']
 
     # Create a queue specifically for processing books and pass in the
     # Flask application context. This ensures that tasks will have access
     # to any extensions / configuration specified to the app, such as
     # models.
     return psq.Queue(
-        client, 'books', extra_context=current_app.app_context)
+        publisher_client, subscriber_client, project,
+        'books', extra_context=current_app.app_context)
 
 
 def process_book(book_id):
diff --git a/7-gce/requirements-dev.txt b/7-gce/requirements-dev.txt
@@ -2,7 +2,7 @@ tox==2.9.1
 flake8==3.5.0
 flaky==3.4.0
 mock==2.0.0
-pytest==3.2.3
+pytest==3.3.1
 pytest-cov==2.5.1
 BeautifulSoup4==4.6.0
 requests==2.18.4
diff --git a/7-gce/requirements.txt b/7-gce/requirements.txt
@@ -1,12 +1,15 @@
 Flask==0.12.2
-google-cloud==0.27.0
+google-cloud-datastore==1.4.0
+google-cloud-storage==1.6.0
+google-cloud-logging==1.4.0
+google-cloud-error_reporting==0.28.0
 gunicorn==19.7.1
 oauth2client==4.1.2
 Flask-SQLAlchemy==2.3.2
 PyMySQL==0.7.11
 Flask-PyMongo==0.5.1
-PyMongo==3.5.1
+PyMongo==3.6.0
 six==1.11.0
 requests[security]==2.18.4
 honcho==1.0.1
-psq==0.5.0
+psq==0.6.0
diff --git a/7-gce/tox.ini b/7-gce/tox.ini
@@ -1,9 +1,8 @@
 [tox]
 skipsdist = True
-envlist = lint,py27,py34
+envlist = lint,py27,py36
 
 [testenv]
-basepython = python2.7
 deps =
   -rrequirements.txt
   -rrequirements-dev.txt
@@ -12,16 +11,14 @@ commands =
 passenv = GOOGLE_APPLICATION_CREDENTIALS DATASTORE_HOST E2E_URL
 setenv = PYTHONPATH={toxinidir}
 
-[testenv:py34]
-basepython = python3.4
 
 [testenv:py27-e2e]
 basepython = python2.7
 commands =
   py.test --no-success-flaky-report -m "e2e" {posargs: tests}
 
-[testenv:py34-e2e]
-basepython = python2.7
+[testenv:py36-e2e]
+basepython = python3.6
 commands =
   py.test --no-success-flaky-report -m "e2e" {posargs: tests}
 
diff --git a/optional-kubernetes-engine/bookshelf/tasks.py b/optional-kubernetes-engine/bookshelf/tasks.py
@@ -21,16 +21,20 @@
 import requests
 
 
+publisher_client = pubsub.PublisherClient()
+subscriber_client = pubsub.SubscriberClient()
+
+
 def get_books_queue():
-    client = pubsub.Client(
-        project=current_app.config['PROJECT_ID'])
+    project = current_app.config['PROJECT_ID']
 
     # Create a queue specifically for processing books and pass in the
     # Flask application context. This ensures that tasks will have access
     # to any extensions / configuration specified to the app, such as
     # models.
     return psq.Queue(
-        client, 'books', extra_context=current_app.app_context)
+        publisher_client, subscriber_client, project,
+        'books', extra_context=current_app.app_context)
 
 
 def process_book(book_id):
diff --git a/optional-kubernetes-engine/requirements-dev.txt b/optional-kubernetes-engine/requirements-dev.txt
diff --git a/optional-kubernetes-engine/requirements.txt b/optional-kubernetes-engine/requirements.txt
diff --git a/optional-kubernetes-engine/tox.ini b/optional-kubernetes-engine/tox.ini
