Update library to use admin_database autogen.

  * Remove dependency on gapic-google-cloud-spanner-admin-database-v1
  * Update imports

Author: Luke Sneeringer

spanner/google/cloud/spanner/client.py

@@ -27,7 +27,7 @@
 from google.api.core import page_iterator
 from google.gax import INITIAL_PAGE
 # pylint: disable=line-too-long
-from google.cloud.gapic.spanner_admin_database.v1.database_admin_client import (  # noqa
+from google.cloud.spanner_admin_database_v1.gapic.database_admin_client import (  # noqa
     DatabaseAdminClient)
 from google.cloud.gapic.spanner_admin_instance.v1.instance_admin_client import (  # noqa
     InstanceAdminClient)

spanner/setup.py

@@ -51,12 +51,14 @@
 
 
 REQUIREMENTS = [
-    'google-cloud-core >= 0.27.0, < 0.28dev',
-    'google-auth >= 1.1.0',
-    'grpcio >= 1.2.0, < 2.0dev',
     'gapic-google-cloud-spanner-v1 >= 0.15.0, < 0.16dev',
-    'gapic-google-cloud-spanner-admin-database-v1 >= 0.15.0, < 0.16dev',
     'gapic-google-cloud-spanner-admin-instance-v1 >= 0.15.0, < 0.16dev',
+    'google-auth >= 1.1.0',
+    'google-cloud-core >= 0.27.0, < 0.28dev',
+    'google-gax>=0.15.15, <0.16dev',
+    'googleapis-common-protos[grpc]>=1.5.2, <2.0dev',
+    'grpc-google-iam-v1>=0.11.4, <0.12dev',
+    'requests>=2.18.4, <3.0dev',
 ]
 
 setup(

spanner/tests/unit/test_client.py

@@ -107,7 +107,7 @@ def test_constructor_credentials_wo_create_scoped(self):
 
     def test_admin_api_lib_name(self):
         from google.cloud.spanner import __version__
-        from google.cloud.gapic.spanner_admin_database import v1 as db
+        from google.cloud.spanner_admin_database_v1 import gapic as db
         from google.cloud.gapic.spanner_admin_instance import v1 as inst
 
         # Get the actual admin client classes.

spanner/tests/unit/test_database.py

@@ -106,7 +106,7 @@ def test_ctor_w_ddl_statements_ok(self):
         self.assertEqual(list(database.ddl_statements), DDL_STATEMENTS)
 
     def test_from_pb_bad_database_name(self):
-        from google.cloud.proto.spanner.admin.database.v1 import (
+        from google.cloud.spanner_admin_database_v1.proto import (
             spanner_database_admin_pb2 as admin_v1_pb2)
 
         database_name = 'INCORRECT_FORMAT'
@@ -117,7 +117,7 @@ def test_from_pb_bad_database_name(self):
             klass.from_pb(database_pb, None)
 
     def test_from_pb_project_mistmatch(self):
-        from google.cloud.proto.spanner.admin.database.v1 import (
+        from google.cloud.spanner_admin_database_v1.proto import (
             spanner_database_admin_pb2 as admin_v1_pb2)
 
         ALT_PROJECT = 'ALT_PROJECT'
@@ -130,7 +130,7 @@ def test_from_pb_project_mistmatch(self):
             klass.from_pb(database_pb, instance)
 
     def test_from_pb_instance_mistmatch(self):
-        from google.cloud.proto.spanner.admin.database.v1 import (
+        from google.cloud.spanner_admin_database_v1.proto import (
             spanner_database_admin_pb2 as admin_v1_pb2)
 
         ALT_INSTANCE = '/projects/%s/instances/ALT-INSTANCE' % (
@@ -144,7 +144,7 @@ def test_from_pb_instance_mistmatch(self):
             klass.from_pb(database_pb, instance)
 
     def test_from_pb_success_w_explicit_pool(self):
-        from google.cloud.proto.spanner.admin.database.v1 import (
+        from google.cloud.spanner_admin_database_v1.proto import (
             spanner_database_admin_pb2 as admin_v1_pb2)
 
         client = _Client()
@@ -161,7 +161,7 @@ def test_from_pb_success_w_explicit_pool(self):
         self.assertIs(database._pool, pool)
 
     def test_from_pb_success_w_hyphen_w_default_pool(self):
-        from google.cloud.proto.spanner.admin.database.v1 import (
+        from google.cloud.spanner_admin_database_v1.proto import (
             spanner_database_admin_pb2 as admin_v1_pb2)
         from google.cloud.spanner.pool import BurstyPool
 
@@ -411,7 +411,7 @@ def test_exists_not_found(self):
                          [('google-cloud-resource-prefix', database.name)])
 
     def test_exists_success(self):
-        from google.cloud.proto.spanner.admin.database.v1 import (
+        from google.cloud.spanner_admin_database_v1.proto import (
             spanner_database_admin_pb2 as admin_v1_pb2)
         from tests._fixtures import DDL_STATEMENTS
 
@@ -468,7 +468,7 @@ def test_reload_not_found(self):
                          [('google-cloud-resource-prefix', database.name)])
 
     def test_reload_success(self):
-        from google.cloud.proto.spanner.admin.database.v1 import (
+        from google.cloud.spanner_admin_database_v1.proto import (
             spanner_database_admin_pb2 as admin_v1_pb2)
         from tests._fixtures import DDL_STATEMENTS