Merge pull request GoogleCloudPlatform#89 from GoogleCloudPlatform/google-cloud

ryanmats · web-flow · commit 2d52555667e7 · 2016-09-26T13:30:40.000-07:00
Move to google-cloud
diff --git a/2-structured-data/bookshelf/model_datastore.py b/2-structured-data/bookshelf/model_datastore.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from flask import current_app
-from gcloud import datastore
+from google.cloud import datastore
 
 
 builtin_list = list
diff --git a/2-structured-data/requirements.txt b/2-structured-data/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-gcloud==0.18.1
+google-cloud==0.19.0
 gunicorn==19.6.0
 oauth2client==3.0.0
 Flask-SQLAlchemy==2.1
diff --git a/2-structured-data/tests/conftest.py b/2-structured-data/tests/conftest.py
@@ -16,7 +16,7 @@
 
 import bookshelf
 import config
-from gcloud.exceptions import ServiceUnavailable
+from google.cloud.exceptions import ServiceUnavailable
 from oauth2client.client import HttpAccessTokenRefreshError
 import pytest
 from retrying import retry
diff --git a/2-structured-data/tox.ini b/2-structured-data/tox.ini
@@ -20,4 +20,4 @@ deps =
   flake8
   flake8-import-order
 commands =
-  flake8 --exclude=env --import-order-style=google
+  flake8 --import-order-style=google bookshelf tests
diff --git a/3-binary-data/bookshelf/model_datastore.py b/3-binary-data/bookshelf/model_datastore.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from flask import current_app
-from gcloud import datastore
+from google.cloud import datastore
 
 
 builtin_list = list
diff --git a/3-binary-data/bookshelf/storage.py b/3-binary-data/bookshelf/storage.py
@@ -17,7 +17,7 @@
 import datetime
 
 from flask import current_app
-from gcloud import storage
+from google.cloud import storage
 import six
 from werkzeug import secure_filename
 from werkzeug.exceptions import BadRequest
diff --git a/3-binary-data/requirements.txt b/3-binary-data/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-gcloud==0.18.1
+google-cloud==0.19.0
 gunicorn==19.6.0
 oauth2client==3.0.0
 Flask-SQLAlchemy==2.1
diff --git a/3-binary-data/tests/conftest.py b/3-binary-data/tests/conftest.py
@@ -16,7 +16,7 @@
 
 import bookshelf
 import config
-from gcloud.exceptions import ServiceUnavailable
+from google.cloud.exceptions import ServiceUnavailable
 from oauth2client.client import HttpAccessTokenRefreshError
 import pytest
 from retrying import retry
diff --git a/3-binary-data/tox.ini b/3-binary-data/tox.ini
@@ -20,4 +20,4 @@ deps =
   flake8
   flake8-import-order
 commands =
-  flake8 --exclude=env --import-order-style=google
+  flake8 --import-order-style=google bookshelf tests
diff --git a/4-auth/bookshelf/model_datastore.py b/4-auth/bookshelf/model_datastore.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from flask import current_app
-from gcloud import datastore
+from google.cloud import datastore
 
 
 builtin_list = list
diff --git a/4-auth/bookshelf/storage.py b/4-auth/bookshelf/storage.py
@@ -17,7 +17,7 @@
 import datetime
 
 from flask import current_app
-from gcloud import storage
+from google.cloud import storage
 import six
 from werkzeug import secure_filename
 from werkzeug.exceptions import BadRequest
diff --git a/4-auth/requirements.txt b/4-auth/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-gcloud==0.18.1
+google-cloud==0.19.0
 gunicorn==19.6.0
 oauth2client==3.0.0
 Flask-SQLAlchemy==2.1
diff --git a/4-auth/tests/conftest.py b/4-auth/tests/conftest.py
@@ -16,7 +16,7 @@
 
 import bookshelf
 import config
-from gcloud.exceptions import ServiceUnavailable
+from google.cloud.exceptions import ServiceUnavailable
 from oauth2client.client import HttpAccessTokenRefreshError
 import pytest
 from retrying import retry
diff --git a/4-auth/tox.ini b/4-auth/tox.ini
@@ -20,4 +20,4 @@ deps =
   flake8
   flake8-import-order
 commands =
-  flake8 --exclude=env --import-order-style=google
+  flake8 --import-order-style=google bookshelf tests
diff --git a/5-logging/bookshelf/model_datastore.py b/5-logging/bookshelf/model_datastore.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from flask import current_app
-from gcloud import datastore
+from google.cloud import datastore
 
 
 builtin_list = list
diff --git a/5-logging/bookshelf/storage.py b/5-logging/bookshelf/storage.py
@@ -17,7 +17,7 @@
 import datetime
 
 from flask import current_app
-from gcloud import storage
+from google.cloud import storage
 import six
 from werkzeug import secure_filename
 from werkzeug.exceptions import BadRequest
diff --git a/5-logging/requirements.txt b/5-logging/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-gcloud==0.18.1
+google-cloud==0.19.0
 gunicorn==19.6.0
 oauth2client==3.0.0
 Flask-SQLAlchemy==2.1
diff --git a/5-logging/tests/conftest.py b/5-logging/tests/conftest.py
@@ -16,7 +16,7 @@
 
 import bookshelf
 import config
-from gcloud.exceptions import ServiceUnavailable
+from google.cloud.exceptions import ServiceUnavailable
 from oauth2client.client import HttpAccessTokenRefreshError
 import pytest
 from retrying import retry
diff --git a/5-logging/tox.ini b/5-logging/tox.ini
@@ -20,4 +20,4 @@ deps =
   flake8
   flake8-import-order
 commands =
-  flake8 --exclude=env --import-order-style=google
+  flake8 --import-order-style=google bookshelf tests
diff --git a/6-pubsub/bookshelf/model_datastore.py b/6-pubsub/bookshelf/model_datastore.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from flask import current_app
-from gcloud import datastore
+from google.cloud import datastore
 
 
 builtin_list = list
diff --git a/6-pubsub/bookshelf/storage.py b/6-pubsub/bookshelf/storage.py
@@ -17,7 +17,7 @@
 import datetime
 
 from flask import current_app
-from gcloud import storage
+from google.cloud import storage
 import six
 from werkzeug import secure_filename
 from werkzeug.exceptions import BadRequest
diff --git a/6-pubsub/bookshelf/tasks.py b/6-pubsub/bookshelf/tasks.py
@@ -16,7 +16,7 @@
 
 from bookshelf import get_model, storage
 from flask import current_app
-from gcloud import pubsub
+from google.cloud import pubsub
 import psq
 import requests
 
diff --git a/6-pubsub/requirements.txt b/6-pubsub/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-gcloud==0.18.1
+google-cloud==0.19.0
 gunicorn==19.6.0
 oauth2client==3.0.0
 Flask-SQLAlchemy==2.1
@@ -9,4 +9,4 @@ PyMongo==3.3.0
 six==1.10.0
 requests[security]==2.11.1
 honcho==0.7.1
-psq==0.4.0
+psq==0.5.0
diff --git a/6-pubsub/tests/conftest.py b/6-pubsub/tests/conftest.py
@@ -16,7 +16,7 @@
 
 import bookshelf
 import config
-from gcloud.exceptions import ServiceUnavailable
+from google.cloud.exceptions import ServiceUnavailable
 from oauth2client.client import HttpAccessTokenRefreshError
 import pytest
 from retrying import retry
diff --git a/6-pubsub/tox.ini b/6-pubsub/tox.ini
@@ -30,4 +30,4 @@ deps =
   flake8
   flake8-import-order
 commands =
-  flake8 --exclude=env --import-order-style=google
+  flake8 --import-order-style=google bookshelf tests
diff --git a/7-gce/bookshelf/model_datastore.py b/7-gce/bookshelf/model_datastore.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from flask import current_app
-from gcloud import datastore
+from google.cloud import datastore
 
 
 builtin_list = list
diff --git a/7-gce/bookshelf/storage.py b/7-gce/bookshelf/storage.py
@@ -17,7 +17,7 @@
 import datetime
 
 from flask import current_app
-from gcloud import storage
+from google.cloud import storage
 import six
 from werkzeug import secure_filename
 from werkzeug.exceptions import BadRequest
diff --git a/7-gce/bookshelf/tasks.py b/7-gce/bookshelf/tasks.py
@@ -16,7 +16,7 @@
 
 from bookshelf import get_model, storage
 from flask import current_app
-from gcloud import pubsub
+from google.cloud import pubsub
 import psq
 import requests
 
diff --git a/7-gce/requirements.txt b/7-gce/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-gcloud==0.18.1
+google-cloud==0.19.0
 gunicorn==19.6.0
 oauth2client==3.0.0
 Flask-SQLAlchemy==2.1
@@ -9,4 +9,4 @@ PyMongo==3.3.0
 six==1.10.0
 requests[security]==2.11.1
 honcho==0.7.1
-psq==0.4.0
+psq==0.5.0
diff --git a/7-gce/tests/conftest.py b/7-gce/tests/conftest.py
@@ -16,7 +16,7 @@
 
 import bookshelf
 import config
-from gcloud.exceptions import ServiceUnavailable
+from google.cloud.exceptions import ServiceUnavailable
 from oauth2client.client import HttpAccessTokenRefreshError
 import pytest
 from retrying import retry
diff --git a/7-gce/tox.ini b/7-gce/tox.ini
@@ -10,9 +10,7 @@ deps =
 commands =
   py.test --cov=bookshelf --no-success-flaky-report -m "not e2e" {posargs: tests}
 passenv = GOOGLE_APPLICATION_CREDENTIALS DATASTORE_HOST E2E_URL
-setenv =
-    PYTHONPATH={toxinidir}
-    =http://localhost:8565
+setenv = PYTHONPATH={toxinidir}
 
 [testenv:py34]
 basepython = python3.4
@@ -32,4 +30,4 @@ deps =
   flake8
   flake8-import-order
 commands =
-  flake8 --exclude=env --import-order-style=google
+  flake8 --import-order-style=google bookshelf tests
diff --git a/optional-container-engine/bookshelf/model_datastore.py b/optional-container-engine/bookshelf/model_datastore.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from flask import current_app
-from gcloud import datastore
+from google.cloud import datastore
 
 
 builtin_list = list
diff --git a/optional-container-engine/bookshelf/storage.py b/optional-container-engine/bookshelf/storage.py
@@ -17,7 +17,7 @@
 import datetime
 
 from flask import current_app
-from gcloud import storage
+from google.cloud import storage
 import six
 from werkzeug import secure_filename
 from werkzeug.exceptions import BadRequest
diff --git a/optional-container-engine/bookshelf/tasks.py b/optional-container-engine/bookshelf/tasks.py
@@ -16,7 +16,7 @@
 
 from bookshelf import get_model, storage
 from flask import current_app
-from gcloud import pubsub
+from google.cloud import pubsub
 import psq
 import requests
 
diff --git a/optional-container-engine/requirements.txt b/optional-container-engine/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-gcloud==0.18.1
+google-cloud==0.19.0
 gunicorn==19.6.0
 oauth2client==3.0.0
 mock==2.0.0
@@ -10,4 +10,4 @@ PyMongo==3.3.0
 six==1.10.0
 requests[security]==2.11.1
 honcho==0.7.1
-psq==0.4.0
+psq==0.5.0
diff --git a/optional-container-engine/tests/conftest.py b/optional-container-engine/tests/conftest.py
@@ -16,7 +16,7 @@
 
 import bookshelf
 import config
-from gcloud.exceptions import ServiceUnavailable
+from google.cloud.exceptions import ServiceUnavailable
 from oauth2client.client import HttpAccessTokenRefreshError
 import pytest
 from retrying import retry
diff --git a/optional-container-engine/tox.ini b/optional-container-engine/tox.ini
@@ -30,4 +30,4 @@ deps =
   flake8
   flake8-import-order
 commands =
-  flake8 --exclude=env --import-order-style=google
+  flake8 --import-order-style=google bookshelf tests
