Prep v1.6.0

mstroehle · Nov 23, 2016 · 35283e6 · 35283e6
1 parent b57a109
commit 35283e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -8,6 +8,6 @@ SQLAlchemy==0.9.4
 unittest2==0.5.1
 zope.component==4.2.1
 configparser==3.5.0b2
-https://github.com/mozilla-services/mozservices/archive/706e09b78a78ebff4f71dcaca2fd7b68fa2885fb.zip
+mozsvc==0.9
 https://github.com/mozilla-services/tokenserver/archive/1.2.23.zip
-https://github.com/mozilla-services/server-syncstorage/archive/236b6e779fb29a08dc63b24f101ff10281e1c0bb.zip
+https://github.com/mozilla-services/server-syncstorage/archive/f0190c0eb730e2cd1fbaf89f95c50114b6289042.zip
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name='syncserver',
-    version="1.5.2",
+    version="1.6.0",
     packages=['syncserver'],
     entry_points=entry_points
 )
diff --git a/syncserver/__init__.py b/syncserver/__init__.py
@@ -83,6 +83,9 @@ def includeme(config):
         settings["storage.backend"] = "syncstorage.storage.sql.SQLStorage"
         settings["storage.sqluri"] = sqluri
         settings["storage.create_tables"] = True
+    if "storage.batch_upload_enabled" not in settings:
+        # Default the new batch-upload API to on
+        settings["storage.batch_upload_enabled"] = True
     if "browserid.backend" not in settings:
         # Default to remote verifier, with base of public_url as only audience
         audience = urlunparse(urlparse(public_url)._replace(path=""))