Move to google.cloud.spanner_v1 (#4064)

docs/spanner/batch-api.rst

@@ -1,8 +1,6 @@
 Batch API
 =========
 
-.. automodule:: google.cloud.spanner.batch
+.. automodule:: google.cloud.spanner_v1.batch
   :members:
   :show-inheritance:
-
-

docs/spanner/client-api.rst

@@ -1,7 +1,7 @@
 Spanner Client
 ==============
 
-.. automodule:: google.cloud.spanner.client
+.. automodule:: google.cloud.spanner_v1.client
   :members:
   :show-inheritance:
 

docs/spanner/database-api.rst

@@ -1,7 +1,7 @@
 Database API
 ============
 
-.. automodule:: google.cloud.spanner.database
+.. automodule:: google.cloud.spanner_v1.database
   :members:
   :show-inheritance:
 

docs/spanner/instance-api.rst

@@ -1,7 +1,7 @@
 Instance API
 ============
 
-.. automodule:: google.cloud.spanner.instance
+.. automodule:: google.cloud.spanner_v1.instance
   :members:
   :show-inheritance:
 

docs/spanner/keyset-api.rst

@@ -1,7 +1,7 @@
 Keyset API
 ==========
 
-.. automodule:: google.cloud.spanner.keyset
+.. automodule:: google.cloud.spanner_v1.keyset
   :members:
   :show-inheritance:
 

docs/spanner/session-api.rst

@@ -1,15 +1,15 @@
 Session API
 ===========
 
-.. automodule:: google.cloud.spanner.session
+.. automodule:: google.cloud.spanner_v1.session
   :members:
   :show-inheritance:
 
 
 Session Pools API
 =================
 
-.. automodule:: google.cloud.spanner.pool
+.. automodule:: google.cloud.spanner_v1.pool
   :members:
   :show-inheritance:
 

docs/spanner/snapshot-api.rst

@@ -1,7 +1,7 @@
 Snapshot API
 ============
 
-.. automodule:: google.cloud.spanner.snapshot
+.. automodule:: google.cloud.spanner_v1.snapshot
   :members:
   :show-inheritance:
 

docs/spanner/streamed-api.rst

@@ -1,7 +1,7 @@
 StreamedResultSet API
 =====================
 
-.. automodule:: google.cloud.spanner.streamed
+.. automodule:: google.cloud.spanner_v1.streamed
   :members:
   :show-inheritance:
 

docs/spanner/transaction-api.rst

@@ -1,7 +1,7 @@
 Transaction API
 ===============
 
-.. automodule:: google.cloud.spanner.transaction
+.. automodule:: google.cloud.spanner_v1.transaction
   :members:
   :show-inheritance:
 

spanner/google/cloud/spanner.py

@@ -0,0 +1,42 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Cloud Spanner API package."""
+
+from __future__ import absolute_import
+
+from google.cloud.spanner_v1 import __version__
+from google.cloud.spanner_v1 import AbstractSessionPool
+from google.cloud.spanner_v1 import BurstyPool
+from google.cloud.spanner_v1 import Client
+from google.cloud.spanner_v1 import enums
+from google.cloud.spanner_v1 import FixedSizePool
+from google.cloud.spanner_v1 import KeyRange
+from google.cloud.spanner_v1 import KeySet
+from google.cloud.spanner_v1 import param_types
+from google.cloud.spanner_v1 import types
+
+
+__all__ = (
+    '__version__',
+    'AbstractSessionPool',
+    'BurstyPool',
+    'Client',
+    'enums',
+    'FixedSizePool',
+    'KeyRange',
+    'KeySet',
+    'param_types',
+    'types',
+)

spanner/google/cloud/spanner_v1/__init__.py

@@ -14,17 +14,38 @@
 
 from __future__ import absolute_import
 
+import pkg_resources
+__version__ = pkg_resources.get_distribution('google-cloud-spanner').version
+
+from google.cloud.spanner_v1 import param_types
 from google.cloud.spanner_v1 import types
+from google.cloud.spanner_v1.client import Client
 from google.cloud.spanner_v1.gapic import enums
-from google.cloud.spanner_v1.gapic import spanner_client
+from google.cloud.spanner_v1.keyset import KeyRange
+from google.cloud.spanner_v1.keyset import KeySet
+from google.cloud.spanner_v1.pool import AbstractSessionPool
+from google.cloud.spanner_v1.pool import BurstyPool
+from google.cloud.spanner_v1.pool import FixedSizePool
 
 
-class SpannerClient(spanner_client.SpannerClient):
-    __doc__ = spanner_client.SpannerClient.__doc__
-    enums = enums
+__all__ = (
+    # google.cloud.spanner_v1
+    '__version__',
+    'param_types',
+    'types',
 
+    # google.cloud.spanner_v1.client
+    'Client',
 
-__all__ = (
+    # google.cloud.spanner_v1.keyset
+    'KeyRange',
+    'KeySet',
+
+    # google.cloud.spanner_v1.pool
+    'AbstractSessionPool',
+    'BurstyPool',
+    'FixedSizePool',
+
+    # google.cloud.spanner_v1.gapic
     'enums',
-    'types',
-    'SpannerClient', )
+)

spanner/google/cloud/spanner/_helpers.py → spanner/google/cloud/spanner_v1/_helpers.py

@@ -251,7 +251,7 @@ def _parse_list_value_pbs(rows, row_type):
 class _SessionWrapper(object):
     """Base class for objects wrapping a session.
 
-    :type session: :class:`~google.cloud.spanner.session.Session`
+    :type session: :class:`~google.cloud.spanner_v1.session.Session`
     :param session: the session used to perform the commit
     """
     def __init__(self, session):

spanner/google/cloud/spanner/batch.py → spanner/google/cloud/spanner_v1/batch.py

@@ -19,16 +19,16 @@
 
 # pylint: disable=ungrouped-imports
 from google.cloud._helpers import _pb_timestamp_to_datetime
-from google.cloud.spanner._helpers import _SessionWrapper
-from google.cloud.spanner._helpers import _make_list_value_pbs
-from google.cloud.spanner._helpers import _options_with_prefix
+from google.cloud.spanner_v1._helpers import _SessionWrapper
+from google.cloud.spanner_v1._helpers import _make_list_value_pbs
+from google.cloud.spanner_v1._helpers import _options_with_prefix
 # pylint: enable=ungrouped-imports
 
 
 class _BatchBase(_SessionWrapper):
     """Accumulate mutations for transmission during :meth:`commit`.
 
-    :type session: :class:`~google.cloud.spanner.session.Session`
+    :type session: :class:`~google.cloud.spanner_v1.session.Session`
     :param session: the session used to perform the commit
     """
     def __init__(self, session):
@@ -111,7 +111,7 @@ def delete(self, table, keyset):
         :type table: str
         :param table: Name of the table to be modified.
 
-        :type keyset: :class:`~google.cloud.spanner.keyset.Keyset`
+        :type keyset: :class:`~google.cloud.spanner_v1.keyset.Keyset`
         :param keyset: Keys/ranges identifying rows to delete.
         """
         delete = Mutation.Delete(

spanner/google/cloud/spanner/client.py → spanner/google/cloud/spanner_v1/client.py

@@ -18,10 +18,10 @@
 
 In the hierarchy of API concepts
 
-* a :class:`~google.cloud.spanner.client.Client` owns an
-  :class:`~google.cloud.spanner.instance.Instance`
-* a :class:`~google.cloud.spanner.instance.Instance` owns a
-  :class:`~google.cloud.spanner.database.Database`
+* a :class:`~google.cloud.spanner_v1.client.Client` owns an
+  :class:`~google.cloud.spanner_v1.instance.Instance`
+* a :class:`~google.cloud.spanner_v1.instance.Instance` owns a
+  :class:`~google.cloud.spanner_v1.database.Database`
 """
 
 from google.api.core import page_iterator
@@ -35,10 +35,10 @@
 
 from google.cloud._http import DEFAULT_USER_AGENT
 from google.cloud.client import ClientWithProject
-from google.cloud.spanner import __version__
-from google.cloud.spanner._helpers import _options_with_prefix
-from google.cloud.spanner.instance import DEFAULT_NODE_COUNT
-from google.cloud.spanner.instance import Instance
+from google.cloud.spanner_v1 import __version__
+from google.cloud.spanner_v1._helpers import _options_with_prefix
+from google.cloud.spanner_v1.instance import DEFAULT_NODE_COUNT
+from google.cloud.spanner_v1.instance import Instance
 
 SPANNER_ADMIN_SCOPE = 'https://www.googleapis.com/auth/spanner.admin'
 
@@ -197,7 +197,7 @@ def list_instance_configs(self, page_size=None, page_token=None):
         :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns:
             Iterator of
-            :class:`~google.cloud.spanner.instance.InstanceConfig`
+            :class:`~google.cloud.spanner_v1.instance.InstanceConfig`
             resources within the client's project.
         """
         if page_token is None:
@@ -236,7 +236,7 @@ def instance(self, instance_id,
         :param node_count: (Optional) The number of nodes in the instance's
                             cluster; used to set up the instance's cluster.
 
-        :rtype: :class:`~google.cloud.spanner.instance.Instance`
+        :rtype: :class:`~google.cloud.spanner_v1.instance.Instance`
         :returns: an instance owned by this client.
         """
         return Instance(
@@ -260,7 +260,7 @@ def list_instances(self, filter_='', page_size=None, page_token=None):
 
         :rtype: :class:`~google.api.core.page_iterator.Iterator`
         :returns:
-            Iterator of :class:`~google.cloud.spanner.instance.Instance`
+            Iterator of :class:`~google.cloud.spanner_v1.instance.Instance`
             resources within the client's project.
         """
         if page_token is None:
@@ -285,7 +285,7 @@ def _item_to_instance_config(
         :class:`~google.spanner.admin.instance.v1.InstanceConfig`
     :param config_pb: An instance config returned from the API.
 
-    :rtype: :class:`~google.cloud.spanner.instance.InstanceConfig`
+    :rtype: :class:`~google.cloud.spanner_v1.instance.InstanceConfig`
     :returns: The next instance config in the page.
     """
     return InstanceConfig.from_pb(config_pb)
@@ -300,7 +300,7 @@ def _item_to_instance(iterator, instance_pb):
     :type instance_pb: :class:`~google.spanner.admin.instance.v1.Instance`
     :param instance_pb: An instance returned from the API.
 
-    :rtype: :class:`~google.cloud.spanner.instance.Instance`
+    :rtype: :class:`~google.cloud.spanner_v1.instance.Instance`
     :returns: The next instance in the page.
     """
     return Instance.from_pb(instance_pb, iterator.client)