Move to google-cloud

Jon Wayne Parrott · Jon Wayne Parrott · commit bcc7bc54772d · 2016-09-29T10:13:39.000-07:00
Change-Id: I1b58d2c77dfd64f3e983e393a9406179bd0e199c
diff --git a/appengine/flexible/datastore/main.py b/appengine/flexible/datastore/main.py
@@ -18,7 +18,7 @@
 import socket
 
 from flask import Flask, request
-from gcloud import datastore
+from google.cloud import datastore
 
 
 app = Flask(__name__)
diff --git a/appengine/flexible/datastore/requirements.txt b/appengine/flexible/datastore/requirements.txt
@@ -1,4 +1,4 @@
 Flask==0.11.1
-gcloud==0.18.3
+google-cloud==0.19.0
 gunicorn==19.6.0
 oauth2client==3.0.0
diff --git a/appengine/flexible/endpoints/requirements.txt b/appengine/flexible/endpoints/requirements.txt
@@ -1,7 +1,7 @@
 Flask==0.11.1
 flask-cors==3.0.2
 gunicorn==19.6.0
-gcloud==0.18.3
+google-cloud==0.19.0
 six==1.10.0
 pyyaml==3.12
 requests==2.11.1
diff --git a/appengine/flexible/pubsub/main.py b/appengine/flexible/pubsub/main.py
@@ -19,7 +19,7 @@
 import os
 
 from flask import current_app, Flask, render_template, request
-from gcloud import pubsub
+from google.cloud import pubsub
 
 
 app = Flask(__name__)
diff --git a/appengine/flexible/pubsub/requirements.txt b/appengine/flexible/pubsub/requirements.txt
@@ -1,4 +1,4 @@
 Flask==0.11.1
-gcloud==0.18.3
+google-cloud==0.19.0
 gunicorn==19.6.0
 oauth2client==3.0.0
diff --git a/appengine/flexible/storage/main.py b/appengine/flexible/storage/main.py
@@ -17,7 +17,7 @@
 import os
 
 from flask import Flask, request
-from gcloud import storage
+from google.cloud import storage
 
 # [start config]
 app = Flask(__name__)
diff --git a/appengine/flexible/storage/requirements.txt b/appengine/flexible/storage/requirements.txt
@@ -1,3 +1,3 @@
 Flask==0.11.1
-gcloud==0.18.3
+google-cloud==0.19.0
 gunicorn==19.6.0
diff --git a/bigquery/cloud-client/async_query.py b/bigquery/cloud-client/async_query.py
@@ -27,7 +27,7 @@
 import time
 import uuid
 
-from gcloud import bigquery
+from google.cloud import bigquery
 
 
 def async_query(query):
diff --git a/bigquery/cloud-client/export_data_to_gcs.py b/bigquery/cloud-client/export_data_to_gcs.py
@@ -29,7 +29,7 @@
 import time
 import uuid
 
-from gcloud import bigquery
+from google.cloud import bigquery
 
 
 def export_data_to_gcs(dataset_name, table_name, destination):
diff --git a/bigquery/cloud-client/load_data_from_file.py b/bigquery/cloud-client/load_data_from_file.py
@@ -27,7 +27,7 @@
 
 import argparse
 import time
-from gcloud import bigquery
+from google.cloud import bigquery
 
 
 def load_data_from_file(dataset_name, table_name, source_file_name):
diff --git a/bigquery/cloud-client/load_data_from_gcs.py b/bigquery/cloud-client/load_data_from_gcs.py
@@ -29,7 +29,7 @@
 import time
 import uuid
 
-from gcloud import bigquery
+from google.cloud import bigquery
 
 
 def load_data_from_gcs(dataset_name, table_name, source):
diff --git a/bigquery/cloud-client/requirements.txt b/bigquery/cloud-client/requirements.txt
@@ -1 +1 @@
-gcloud==0.18.3
+google-cloud==0.19.0
diff --git a/bigquery/cloud-client/snippets.py b/bigquery/cloud-client/snippets.py
@@ -28,7 +28,7 @@
 import time
 import uuid
 
-from gcloud import bigquery
+from google.cloud import bigquery
 import gcloud.bigquery.job
 
 
diff --git a/bigquery/cloud-client/snippets_test.py b/bigquery/cloud-client/snippets_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gcloud import bigquery
+from google.cloud import bigquery
 import pytest
 
 import snippets
diff --git a/bigquery/cloud-client/stream_data.py b/bigquery/cloud-client/stream_data.py
@@ -29,7 +29,7 @@
 import json
 from pprint import pprint
 
-from gcloud import bigquery
+from google.cloud import bigquery
 
 
 def stream_data(dataset_name, table_name, json_data):
diff --git a/bigquery/cloud-client/sync_query.py b/bigquery/cloud-client/sync_query.py
@@ -26,7 +26,7 @@
 import argparse
 
 # [START sync_query]
-from gcloud import bigquery
+from google.cloud import bigquery
 
 
 def sync_query(query):
diff --git a/bigtable/hello/main.py b/bigtable/hello/main.py
@@ -26,7 +26,7 @@
 
 import argparse
 
-from gcloud import bigtable
+from google.cloud import bigtable
 
 
 def main(project_id, instance_id, table_id):
diff --git a/bigtable/hello/requirements.txt b/bigtable/hello/requirements.txt
@@ -1 +1 @@
-gcloud[grpc]==0.18.3
+google-cloud==0.19.0
diff --git a/bigtable/hello_happybase/main.py b/bigtable/hello_happybase/main.py
@@ -26,8 +26,8 @@
 
 import argparse
 
-from gcloud import bigtable
-from gcloud.bigtable import happybase
+from google.cloud import bigtable
+from google.cloud.bigtable import happybase
 
 
 def main(project_id, instance_id, table_name):
diff --git a/bigtable/hello_happybase/requirements.txt b/bigtable/hello_happybase/requirements.txt
@@ -1 +1 @@
-gcloud[grpc]==0.18.3
+google=cloud==0.19.0
diff --git a/blog/introduction_to_data_models_in_cloud_datastore/blog.py b/blog/introduction_to_data_models_in_cloud_datastore/blog.py
@@ -14,7 +14,7 @@
 import argparse
 import datetime
 
-from gcloud import datastore
+from google.cloud import datastore
 
 
 def path_to_key(datastore, path):
diff --git a/blog/introduction_to_data_models_in_cloud_datastore/requirements.txt b/blog/introduction_to_data_models_in_cloud_datastore/requirements.txt
@@ -1 +1 @@
-gcloud==0.18.3
+google-cloud==0.19.0
diff --git a/blog/introduction_to_data_models_in_cloud_datastore/wiki.py b/blog/introduction_to_data_models_in_cloud_datastore/wiki.py
@@ -14,7 +14,7 @@
 import argparse
 import datetime
 
-from gcloud import datastore
+from google.cloud import datastore
 
 
 def path_to_key(datastore, path):
diff --git a/dataproc/create_cluster_and_submit_job.py b/dataproc/create_cluster_and_submit_job.py
@@ -17,7 +17,7 @@
 import os
 
 from apiclient import discovery
-from gcloud import storage
+from google.cloud import storage
 from oauth2client.client import GoogleCredentials
 
 # Currently only the "global" region is supported
diff --git a/dataproc/requirements.txt b/dataproc/requirements.txt
@@ -1,2 +1,2 @@
 google-api-python-client==1.5.3
-gcloud==0.18.3
+google-cloud==0.19.0
diff --git a/datastore/api/requirements.txt b/datastore/api/requirements.txt
@@ -1 +1 @@
-gcloud==0.18.3
+google-cloud==0.19.0
diff --git a/datastore/api/snippets.py b/datastore/api/snippets.py
@@ -17,7 +17,7 @@
 from pprint import pprint
 
 import gcloud
-from gcloud import datastore
+from google.cloud import datastore
 
 
 def incomplete_key(client):
diff --git a/datastore/api/snippets_test.py b/datastore/api/snippets_test.py
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gcloud import datastore
+from google.cloud import datastore
 from gcp.testing import eventually_consistent
 from gcp.testing.flaky import flaky
 import pytest
diff --git a/datastore/api/tasks.py b/datastore/api/tasks.py
@@ -15,7 +15,7 @@
 import datetime
 
 # [START build_service]
-from gcloud import datastore
+from google.cloud import datastore
 
 
 def create_client(project_id):
diff --git a/datastore/api/tasks_test.py b/datastore/api/tasks_test.py
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gcloud import datastore
+from google.cloud import datastore
 from gcp.testing import eventually_consistent
 from gcp.testing.flaky import flaky
 import pytest
diff --git a/dns/api/main.py b/dns/api/main.py
@@ -13,8 +13,8 @@
 
 import argparse
 
-from gcloud import dns
-from gcloud.exceptions import NotFound
+from google.cloud import dns
+from google.cloud.exceptions import NotFound
 
 
 # [START create_zone]
diff --git a/dns/api/main_test.py b/dns/api/main_test.py
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gcloud import dns
+from google.cloud import dns
 from gcp.testing.flaky import flaky
 import pytest
 
diff --git a/dns/api/requirements.txt b/dns/api/requirements.txt
@@ -1 +1 @@
-gcloud==0.18.3
+google-cloud==0.19.0
diff --git a/logging/cloud-client/export.py b/logging/cloud-client/export.py
@@ -16,7 +16,7 @@
 
 import argparse
 
-from gcloud import logging
+from google.cloud import logging
 
 
 def list_sinks():
diff --git a/logging/cloud-client/export_test.py b/logging/cloud-client/export_test.py
@@ -15,7 +15,7 @@
 import random
 import string
 
-from gcloud import logging
+from google.cloud import logging
 from gcp.testing import eventually_consistent
 import pytest
 
diff --git a/logging/cloud-client/requirements.txt b/logging/cloud-client/requirements.txt
@@ -1 +1 @@
-gcloud==0.18.3
+google-cloud==0.19.0
diff --git a/logging/cloud-client/snippets.py b/logging/cloud-client/snippets.py
@@ -23,7 +23,7 @@
 
 import argparse
 
-from gcloud import logging
+from google.cloud import logging
 
 
 def write_entry(logger_name):
diff --git a/logging/cloud-client/snippets_test.py b/logging/cloud-client/snippets_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gcloud import logging
+from google.cloud import logging
 from gcp.testing import eventually_consistent
 import pytest
 
diff --git a/pubsub/cloud-client/iam.py b/pubsub/cloud-client/iam.py
@@ -23,7 +23,7 @@
 
 import argparse
 
-from gcloud import pubsub
+from google.cloud import pubsub
 
 
 def get_topic_policy(topic_name):
diff --git a/pubsub/cloud-client/iam_test.py b/pubsub/cloud-client/iam_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gcloud import pubsub
+from google.cloud import pubsub
 import pytest
 
 import iam
diff --git a/pubsub/cloud-client/publisher.py b/pubsub/cloud-client/publisher.py
@@ -23,7 +23,7 @@
 
 import argparse
 
-from gcloud import pubsub
+from google.cloud import pubsub
 
 
 def list_topics():
diff --git a/pubsub/cloud-client/publisher_test.py b/pubsub/cloud-client/publisher_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gcloud import pubsub
+from google.cloud import pubsub
 from gcp.testing import eventually_consistent
 import pytest
 
diff --git a/pubsub/cloud-client/requirements.txt b/pubsub/cloud-client/requirements.txt
@@ -1 +1 @@
-gcloud==0.18.3
+google-cloud==0.19.0
diff --git a/pubsub/cloud-client/subscriber.py b/pubsub/cloud-client/subscriber.py
@@ -23,7 +23,7 @@
 
 import argparse
 
-from gcloud import pubsub
+from google.cloud import pubsub
 
 
 def list_subscriptions(topic_name):
diff --git a/pubsub/cloud-client/subscriber_test.py b/pubsub/cloud-client/subscriber_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gcloud import pubsub
+from google.cloud import pubsub
 from gcp.testing import eventually_consistent
 import pytest
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -11,8 +11,7 @@ Flask-SQLAlchemy==2.1
 Flask==0.11.1
 fluent-logger==0.4.4
 funcsigs==1.0.2
-gcloud==0.18.3
-gcloud[grpc]==0.18.3
+google-cloud==0.19.0
 google-api-python-client==1.5.3
 grpc-google-cloud-speech-v1beta1==1.0.1
 grpcio==1.0.0
diff --git a/speech/grpc/requirements.txt b/speech/grpc/requirements.txt
@@ -1,4 +1,4 @@
-gcloud==0.18.3
+google-cloud==0.19.0
 grpcio==1.0.0
 PyAudio==0.2.9
 grpc-google-cloud-speech-v1beta1==1.0.1
diff --git a/speech/grpc/transcribe.py b/speech/grpc/transcribe.py
@@ -17,7 +17,7 @@
 
 import argparse
 
-from gcloud.credentials import get_credentials
+from google.cloud.credentials import get_credentials
 from google.cloud.speech.v1beta1 import cloud_speech_pb2 as cloud_speech
 from grpc.beta import implementations
 
diff --git a/speech/grpc/transcribe_async.py b/speech/grpc/transcribe_async.py
@@ -19,7 +19,7 @@
 import argparse
 import time
 
-from gcloud.credentials import get_credentials
+from google.cloud.credentials import get_credentials
 from google.cloud.speech.v1beta1 import cloud_speech_pb2
 from google.longrunning import operations_grpc_pb2
 from grpc.beta import implementations
diff --git a/speech/grpc/transcribe_streaming.py b/speech/grpc/transcribe_streaming.py
@@ -21,7 +21,7 @@
 import signal
 import threading
 
-from gcloud import credentials
+from google.cloud import credentials
 from google.cloud.speech.v1beta1 import cloud_speech_pb2 as cloud_speech
 from google.rpc import code_pb2
 from grpc.beta import implementations
diff --git a/storage/cloud-client/acl.py b/storage/cloud-client/acl.py
@@ -23,7 +23,7 @@
 
 import argparse
 
-from gcloud import storage
+from google.cloud import storage
 
 
 def print_bucket_acl(bucket_name):
diff --git a/storage/cloud-client/acl_test.py b/storage/cloud-client/acl_test.py
diff --git a/storage/cloud-client/encryption.py b/storage/cloud-client/encryption.py
diff --git a/storage/cloud-client/encryption_test.py b/storage/cloud-client/encryption_test.py
diff --git a/storage/cloud-client/requirements.txt b/storage/cloud-client/requirements.txt
diff --git a/storage/cloud-client/snippets.py b/storage/cloud-client/snippets.py
diff --git a/storage/cloud-client/snippets_test.py b/storage/cloud-client/snippets_test.py
