Upgrade dependencies to gapic-* 0.9.x packages (#2324)

* Upgrade dependencies to gapic-* 0.9.x packages

* Fix import statements

* Updating coverage ignored modules for gapic package.

Author: Brian J. Watson

.coveragerc

@@ -5,8 +5,7 @@ branch = True
 omit =
     */_generated/*.py
     # Packages in the "google.cloud" package that we don't own.
-    */google/cloud/logging/v2/*
-    */google/cloud/pubsub/v1/*
+    */google/cloud/gapic/*
 fail_under = 100
 show_missing = True
 exclude_lines =

google/cloud/logging/client.py

@@ -17,11 +17,11 @@
 import os
 
 try:
-    from google.cloud.logging.v2.config_service_v2_api import (
+    from google.cloud.gapic.logging.v2.config_service_v2_api import (
         ConfigServiceV2Api as GeneratedSinksAPI)
-    from google.cloud.logging.v2.logging_service_v2_api import (
+    from google.cloud.gapic.logging.v2.logging_service_v2_api import (
         LoggingServiceV2Api as GeneratedLoggingAPI)
-    from google.cloud.logging.v2.metrics_service_v2_api import (
+    from google.cloud.gapic.logging.v2.metrics_service_v2_api import (
         MetricsServiceV2Api as GeneratedMetricsAPI)
     from google.cloud.logging._gax import _LoggingAPI as GAXLoggingAPI
     from google.cloud.logging._gax import _MetricsAPI as GAXMetricsAPI

google/cloud/pubsub/_gax.py

@@ -14,8 +14,8 @@
 
 """GAX wrapper for Pubsub API requests."""
 
-from google.cloud.pubsub.v1.publisher_api import PublisherApi
-from google.cloud.pubsub.v1.subscriber_api import SubscriberApi
+from google.cloud.gapic.pubsub.v1.publisher_api import PublisherApi
+from google.cloud.gapic.pubsub.v1.subscriber_api import SubscriberApi
 from google.gax import CallOptions
 from google.gax import INITIAL_PAGE
 from google.gax.errors import GaxError

setup.py

@@ -15,17 +15,17 @@
     'httplib2 >= 0.9.1',
     'googleapis-common-protos',
     'oauth2client >= 2.0.1',
-    'protobuf >= 3.0.0b2, != 3.0.0.b2.post1',
+    'protobuf >= 3.0.0',
     'six',
 ]
 
 GRPC_PACKAGES = [
-    'grpcio >= 1.0rc1',
-    'google-gax >= 0.12.3, < 0.13dev',
-    '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',
+    'grpcio >= 1.0.0',
+    'google-gax >= 0.13.0, < 0.14dev',
+    'gapic-google-pubsub-v1 >= 0.9.0, < 0.10dev',
+    'grpc-google-pubsub-v1 >= 0.9.0, < 0.10dev',
+    'gapic-google-logging-v2 >= 0.9.0, < 0.10dev',
+    'grpc-google-logging-v2 >= 0.9.0, < 0.10dev',
 ]
 
 RTD_ENV_VAR = 'READTHEDOCS'