Replacing v1beta3 with v1 in handwritten datastore references.

dhermes · dhermes · commit c52d3635c16b · 2016-08-16T14:58:35.000-07:00
diff --git a/README.rst b/README.rst
@@ -74,7 +74,7 @@ writes, strong consistency for reads and ancestor queries, and eventual
 consistency for all other queries.
 
 .. _Cloud Datastore: https://cloud.google.com/datastore/docs
-.. _Datastore API docs: https://cloud.google.com/datastore/docs/apis/v1beta3/
+.. _Datastore API docs: https://cloud.google.com/datastore/docs/
 
 See the ``gcloud-python`` API `datastore documentation`_ to learn how to
 interact with the Cloud Datastore using this Client Library.
diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py
@@ -43,7 +43,7 @@ class Connection(connection.Connection):
     API_BASE_URL = 'https://datastore.googleapis.com'
     """The base of the API call URL."""
 
-    API_VERSION = 'v1beta3'
+    API_VERSION = 'v1'
     """The version of the API, used in building the API call's URL."""
 
     API_URL_TEMPLATE = ('{api_base}/{api_version}/projects'
diff --git a/scripts/make_datastore_grpc.py b/scripts/make_datastore_grpc.py
@@ -25,7 +25,7 @@
     os.path.join(os.path.dirname(__file__), '..'))
 PROTOS_DIR = os.path.join(ROOT_DIR, 'googleapis-pb')
 PROTO_PATH = os.path.join(PROTOS_DIR, 'google', 'datastore',
-                          'v1beta3', 'datastore.proto')
+                          'v1', 'datastore.proto')
 GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'gcloud', 'datastore',
                               '_generated', 'datastore_grpc_pb2.py')
 GRPCIO_VIRTUALENV = os.environ.get('GRPCIO_VIRTUALENV', 'protoc')
@@ -39,7 +39,7 @@ def get_pb2_contents_with_grpc():
     """
     temp_dir = tempfile.mkdtemp()
     generated_path = os.path.join(temp_dir, 'google', 'datastore',
-                                  'v1beta3', 'datastore_pb2.py')
+                                  'v1', 'datastore_pb2.py')
     try:
         return_code = subprocess.call([
             '%s/bin/python' % GRPCIO_VIRTUALENV,
@@ -69,7 +69,7 @@ def get_pb2_contents_without_grpc():
     """
     temp_dir = tempfile.mkdtemp()
     generated_path = os.path.join(temp_dir, 'google', 'datastore',
-                                  'v1beta3', 'datastore_pb2.py')
+                                  'v1', 'datastore_pb2.py')
     try:
         return_code = subprocess.call([
             '%s/bin/python' % GRPCIO_VIRTUALENV,
diff --git a/scripts/rewrite_imports.py b/scripts/rewrite_imports.py
@@ -27,8 +27,8 @@
     # Bigtable v2
     'google.bigtable.v2': 'gcloud.bigtable._generated',
     'google.bigtable.admin.v2': 'gcloud.bigtable._generated',
-    # Datastore v1beta3
-    'google.datastore.v1beta3': 'gcloud.datastore._generated',
+    # Datastore v1
+    'google.datastore.v1': 'gcloud.datastore._generated',
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@`
`27`	`27`	`# Bigtable v2`
`28`	`28`	`'google.bigtable.v2': 'gcloud.bigtable._generated',`
`29`	`29`	`'google.bigtable.admin.v2': 'gcloud.bigtable._generated',`
`30`		`- # Datastore v1beta3`
`31`		`- 'google.datastore.v1beta3': 'gcloud.datastore._generated',`
	`30`	`+ # Datastore v1`
	`31`	`+ 'google.datastore.v1': 'gcloud.datastore._generated',`
`32`	`32`	`}`
`33`	`33`
`34`	`34`