Bump version to 1.1.0.

wsh · wsh · commit f0c52e40f671 · 2017-08-04T18:12:09.000-07:00
Restore local_cloud_datastore_factory from MOE sync, modify to be
compatible with googledatastore 7.0.1.
Bump dependency to googledatastore 7.0.1.
Add IntelliJ dirs to .gitignore.
Bump App Engine SDK to 1.9.57, add SHA-256 checksum verification for
download.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,7 @@ htmlcov
 nosetests.xml
 
 # Travis cache
-cache/
+cache/
+
+# IDE files
+.idea
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,3 +1,8 @@
+Release 1.1.0
+----------------------------------------
+
+- Bump google-datastore dependency to 7.1
+
 Release 1.0.12 (included in SDK 1.9.21)
 
 - Improved ndb deserialization speed in keys.
diff --git a/get_app_engine_sdk.sh b/get_app_engine_sdk.sh
@@ -27,16 +27,18 @@ fi
 
 cd cache
 
-if [[ -f google_appengine_1.9.35.zip ]]; then
+if [[ -f google_appengine_1.9.57.zip ]]; then
   echo "App Engine SDK already downloaded. Doing nothing."
 else
-  wget https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.35.zip -nv
+  echo "d5c4fad8afa2ce9005481575c01558248a0fbe0b4554c6de060e925899cfbf66  google_appengine_1.9.57.zip" > sum.txt
+  wget https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.57.zip -nv
+  sha256sum --status -c sum.txt
 fi
 
 if [[ -d google_appengine ]]; then
   echo "App Engine SDK already unzipped. Doing nothing."
 else
-  unzip -q google_appengine_1.9.35.zip
+  unzip -q google_appengine_1.9.57.zip
 fi
 
 echo "Cache contents after getting SDK:"
diff --git a/ndb/__init__.py b/ndb/__init__.py
@@ -15,7 +15,7 @@
 
 """NDB -- A new datastore API for the Google App Engine Python runtime."""
 
-__version__ = '1.0.13b1'
+__version__ = '1.1.0'
 
 __all__ = []
 
diff --git a/ndb/local_cloud_datastore_factory.py b/ndb/local_cloud_datastore_factory.py
@@ -0,0 +1,32 @@
+#
+# Copyright 2015 The ndb Authors. 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.
+
+import os
+import tempfile
+
+from .google_imports import datastore_pbs
+
+from googledatastore import datastore_emulator
+
+class LocalCloudDatastoreFactory(
+    datastore_emulator.DatastoreEmulatorFactory):
+
+  def __init__(self):
+    working_directory = tempfile.mkdtemp()
+    gcd_zip = os.getenv('GCD_ZIP')
+    if not gcd_zip or not os.path.exists(gcd_zip):
+      raise ValueError('Must provide a valid path to the gcd.zip file in the '
+                       'environment variable GCD_ZIP')
+    super(LocalCloudDatastoreFactory, self).__init__(working_directory, gcd_zip)
diff --git a/ndb/test_utils.py b/ndb/test_utils.py
@@ -174,8 +174,8 @@ class NDBCloudDatastoreV1Test(NDBBaseTest):
   def setUpClass(cls):
     # Late import so that tests can still run if googledatastore is not
     # available.
-    from . import datastore_emulator
-    factory = datastore_emulator.DatastoreEmulatorFactory()
+    from . import local_cloud_datastore_factory
+    factory = local_cloud_datastore_factory.LocalCloudDatastoreFactory()
     cls.datastore = factory.Create(cls.APP_ID)
 
   @classmethod
diff --git a/setup.py b/setup.py
@@ -20,15 +20,15 @@
 
 
 REQUIREMENTS = [
-    'googledatastore==5.0.0b0',
+    'googledatastore==7.0.1',
 ]
 TEST_REQUIREMENTS = [
     'portpicker',
 ]
 
 setup(
     name='ndb',
-    version='1.0.13b1',
+    version='1.1.0',
     description='NDB Client Library for Cloud Datastore',
     author='Google Cloud Datastore Team',
     author_email='gcd-discuss@googlegroups.com',
