diff --git a/gcloud/logging/client.py b/gcloud/logging/client.py index d662a3a2b349..9bee2668849e 100644 --- a/gcloud/logging/client.py +++ b/gcloud/logging/client.py @@ -17,11 +17,11 @@ import os try: - from google.logging.v2.config_service_v2_api import ( + from google.cloud.logging.v2.config_service_v2_api import ( ConfigServiceV2Api as GeneratedSinksAPI) - from google.logging.v2.logging_service_v2_api import ( + from google.cloud.logging.v2.logging_service_v2_api import ( LoggingServiceV2Api as GeneratedLoggingAPI) - from google.logging.v2.metrics_service_v2_api import ( + from google.cloud.logging.v2.metrics_service_v2_api import ( MetricsServiceV2Api as GeneratedMetricsAPI) from gcloud.logging._gax import _LoggingAPI as GAXLoggingAPI from gcloud.logging._gax import _MetricsAPI as GAXMetricsAPI diff --git a/gcloud/pubsub/client.py b/gcloud/pubsub/client.py index bb610e3fd68e..e5f88ab36cb5 100644 --- a/gcloud/pubsub/client.py +++ b/gcloud/pubsub/client.py @@ -26,9 +26,9 @@ # pylint: disable=ungrouped-imports try: - from google.pubsub.v1.publisher_api import ( + from google.cloud.pubsub.v1.publisher_api import ( PublisherApi as GeneratedPublisherAPI) - from google.pubsub.v1.subscriber_api import ( + from google.cloud.pubsub.v1.subscriber_api import ( SubscriberApi as GeneratedSubscriberAPI) from gcloud.pubsub._gax import _PublisherAPI as GAXPublisherAPI from gcloud.pubsub._gax import _SubscriberAPI as GAXSubscriberAPI diff --git a/setup.py b/setup.py index 1a1ce0ef043d..d9da90b1f992 100644 --- a/setup.py +++ b/setup.py @@ -22,10 +22,10 @@ GRPC_EXTRAS = [ 'grpcio >= 1.0rc1', 'google-gax >= 0.12.3, < 0.13dev', - 'gax-google-pubsub-v1 >= 0.7.12, < 0.8dev', - 'grpc-google-pubsub-v1 >= 0.7.12, < 0.8dev', - 'gax-google-logging-v2 >= 0.7.12, < 0.8dev', - 'grpc-google-logging-v2 >= 0.7.12, < 0.8dev', + 'gax-google-pubsub-v1 >= 0.8.0, < 0.9dev', + 'grpc-google-pubsub-v1 >= 0.8.0, < 0.9dev', + 'gax-google-logging-v2 >= 0.8.0, < 0.9dev', + 'grpc-google-logging-v2 >= 0.8.0, < 0.9dev', ] if sys.version_info[:2] == (2, 7) and 'READTHEDOCS' not in os.environ: diff --git a/tox.ini b/tox.ini index 5ada8ce9ba10..ae7245686e6b 100644 --- a/tox.ini +++ b/tox.ini @@ -20,10 +20,10 @@ covercmd = deps = grpcio >= 1.0rc1 google-gax >= 0.12.3, < 0.13dev - gax-google-pubsub-v1 >= 0.7.12, < 0.8dev - grpc-google-pubsub-v1 >= 0.7.12, < 0.8dev - gax-google-logging-v2 >= 0.7.12, < 0.8dev - grpc-google-logging-v2 >= 0.7.12, < 0.8dev + gax-google-pubsub-v1 >= 0.8.0, < 0.9dev + grpc-google-pubsub-v1 >= 0.8.0, < 0.9dev + gax-google-logging-v2 >= 0.8.0, < 0.9dev + grpc-google-logging-v2 >= 0.8.0, < 0.9dev [docs] deps =