diff --git a/appengine/flexible/datastore/main.py b/appengine/flexible/datastore/main.py index 5182f620dd08..a6e001010bc3 100644 --- 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 index 2f8ee232f36d..12573efcb850 100644 --- 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 index 847a65872d58..d5b11387a072 100644 --- 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 index f7e7eb42adca..433a9d4aaee8 100644 --- 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 index 2f8ee232f36d..12573efcb850 100644 --- 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 index 096fbfed9707..b5834362600c 100644 --- 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 index 1f5638e3eb84..2a38d3c7b00d 100644 --- 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 index 0ca324240893..37192d156599 100755 --- 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 index c9771ea1b0d5..e9037ee01580 100644 --- 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 index cbb015347352..b4f851f1adeb 100644 --- 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 index 1a577be649ca..4aa435fad007 100644 --- 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 index 97a207d3aad0..9ccb242d5d7e 100644 --- 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 index d201a84cba80..997459fa4f78 100644 --- 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 index 372cbc834bf6..35f79af7b57b 100644 --- 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 index 5df6be114446..a90d432bf3e4 100644 --- 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 index 59007b537833..f21270ed0706 100755 --- 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 index 949c6baffbf5..72d86f904b41 100644 --- 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 index a14adce81e68..9ccb242d5d7e 100644 --- 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 index 519eedc0676e..3afc70ceaa6d 100644 --- 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 index a14adce81e68..f8eac2f2fe94 100644 --- 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 index f3b0d54c0b84..bb64ebbd0ebd 100644 --- 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 index 97a207d3aad0..9ccb242d5d7e 100644 --- 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 index 28f12e4a3525..160b58d16a8e 100644 --- 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 index 9275f1f9e8ed..426a73e5c782 100644 --- 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 index 8d2c52acc2e3..d5afea09da20 100644 --- 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 index 97a207d3aad0..9ccb242d5d7e 100644 --- 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 index 2552ba5a7f95..77d88163fb32 100644 --- 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 index 8afb05d79ec1..ea971716b344 100644 --- 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 index 72d8fc2bf3b1..bdd97780721c 100644 --- 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 index 33104518a399..9712cb3ca210 100644 --- 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 index 26528efbc497..2ed3d61d7c37 100644 --- 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 index 91282ad60e9f..526d9cb9778f 100644 --- 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 index 97a207d3aad0..9ccb242d5d7e 100644 --- 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 index b24dd9878da7..20367c274b21 100644 --- 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 index d4dfd681ea31..e927af185614 100644 --- 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 index 97a207d3aad0..9ccb242d5d7e 100644 --- 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 index f73143ec8bc2..0280cfbe4063 100644 --- 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 index f41f52fb5575..c25cc4e45faf 100644 --- 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 index 3828195bce00..1f97e4570e7a 100644 --- 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 index 0e662fcb526c..7adf87056e6d 100644 --- 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 index 61387d67ee1c..d527b54cb1c4 100644 --- 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 index 3cce3c962005..685e436a2997 100644 --- 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 index 97a207d3aad0..9ccb242d5d7e 100644 --- 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 index 2b3371cd6165..b4fdd95738d1 100644 --- 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 index 6335aa9733cd..5145016b379c 100644 --- 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 index 80dc4684a600..9b731a3a8c16 100644 --- 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 index cc9e74dfbff3..2f83619e038c 100644 --- 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 index 0bbb098710d0..c0800defad16 100644 --- 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 index 5b9d323d5af8..86ce8f9ba719 100644 --- 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 index b1c2e63bae54..c944767ace66 100644 --- 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 index 324f51b2dee0..d742ae428495 100644 --- 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 index eca1570d8802..44aa32ef9475 100644 --- a/storage/cloud-client/acl_test.py +++ b/storage/cloud-client/acl_test.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from gcloud import storage +from google.cloud import storage import gcloud.storage.acl import pytest diff --git a/storage/cloud-client/encryption.py b/storage/cloud-client/encryption.py index 571b91b21203..d15be17c2af3 100644 --- a/storage/cloud-client/encryption.py +++ b/storage/cloud-client/encryption.py @@ -31,7 +31,7 @@ import base64 import os -from gcloud import storage +from google.cloud import storage def generate_encryption_key(): diff --git a/storage/cloud-client/encryption_test.py b/storage/cloud-client/encryption_test.py index 52d3e6d15d91..28fa5e3b8959 100644 --- a/storage/cloud-client/encryption_test.py +++ b/storage/cloud-client/encryption_test.py @@ -15,7 +15,7 @@ import base64 import tempfile -from gcloud import storage +from google.cloud import storage import pytest import encryption diff --git a/storage/cloud-client/requirements.txt b/storage/cloud-client/requirements.txt index 97a207d3aad0..9ccb242d5d7e 100644 --- a/storage/cloud-client/requirements.txt +++ b/storage/cloud-client/requirements.txt @@ -1 +1 @@ -gcloud==0.18.3 +google-cloud==0.19.0 diff --git a/storage/cloud-client/snippets.py b/storage/cloud-client/snippets.py index 0f6b88cb3dea..c6c69d6ae664 100644 --- a/storage/cloud-client/snippets.py +++ b/storage/cloud-client/snippets.py @@ -24,7 +24,7 @@ import argparse import datetime -from gcloud import storage +from google.cloud import storage def create_bucket(bucket_name): diff --git a/storage/cloud-client/snippets_test.py b/storage/cloud-client/snippets_test.py index f215d2754870..8d34ab2ff25c 100644 --- a/storage/cloud-client/snippets_test.py +++ b/storage/cloud-client/snippets_test.py @@ -15,7 +15,7 @@ import tempfile import gcloud -from gcloud import storage +from google.cloud import storage import pytest import requests