Merge branch 'prepare-1.3.0'

CHANGELOG.rst

@@ -4,10 +4,15 @@ CHANGELOG
 This document describes changes between each past release.
 
 
-1.3.0 (unreleased)
+1.3.0 (2015-10-27)
 ------------------
 
-- Nothing changed yet.
+- Upgraded to *Cliquet* 2.9.0
+
+**Protocol**
+
+- Client-state id should now be provided through the bucket id in the
+  URL (#62)
 
 
 1.2.0 (2015-10-22)

Makefile

@@ -29,6 +29,12 @@ $(PYTHON):
 	virtualenv $(VENV)
 	$(VENV)/bin/pip install --upgrade pip
 
+build-requirements:
+	@rm -fr /tmp/syncto
+	$(VIRTUALENV) /tmp/syncto
+	/tmp/syncto/bin/pip install -Ue .
+	/tmp/syncto/bin/pip freeze > requirements.txt
+
 serve: install-dev
 	$(VENV)/bin/cliquet --ini $(SERVER_CONFIG) migrate
 	$(VENV)/bin/pserve $(SERVER_CONFIG) --reload

dev-requirements.txt

@@ -7,4 +7,3 @@ requests
 nose
 nose-cov
 nose-mocha-reporter
-https://github.com/mozilla-services/cliquet/archive/master.zip

docs/conf.py

@@ -67,9 +67,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2'
+version = '1.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.3.0'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

docs/installation.rst

@@ -134,9 +134,9 @@ However, the set of settings mentionned below might deserve some review or adjus
 :note:
 
     For an exhaustive list of available settings and their default values,
-    refer to `cliquet source code <https://github.com/mozilla-services/cliquet/blob/2.8.2/cliquet/__init__.py#L26-L83>`_.
+    refer to `cliquet source code <https://github.com/mozilla-services/cliquet/blob/2.9.0/cliquet/__init__.py#L26-L86>`_.
 
-     Click here for `Syncto specific settings <https://github.com/mozilla-services/syncto/blob/1.2.0/syncto/__init__.py#L21-L28>`_
+     Click here for `Syncto specific settings <https://github.com/mozilla-services/syncto/blob/1.3.0/syncto/__init__.py#L22-L29>`_
 
 
 Enable write access

requirements.txt

@@ -30,7 +30,7 @@ requests==2.8.1
 requests-hawk==0.2.1
 simplejson==3.8.0
 six==1.10.0
-statsd==3.2
+statsd==3.2.1
 structlog==15.3.0
 syncclient==0.6.0
 translationstring==1.3

setup.py

@@ -13,11 +13,11 @@
 
 
 REQUIREMENTS = [
-    'waitress',
-    'cliquet[monitoring]',
-    'hkdf',
-    'PyNaCl',
-    'syncclient',
+    'waitress>=0.8,<0.9',
+    'cliquet[monitoring]>=2.9,<2.10',
+    'hkdf>=0.0.3,<0.1',
+    'PyNaCl>=0.3,<0.4',
+    'syncclient>=0.6,<0.7',
 ]
 
 if PY2:
@@ -33,7 +33,7 @@
     ]}
 
 setup(name='syncto',
-      version='1.3.0.dev0',
+      version='1.3.0',
       description='Read Firefox Sync server using Kinto API.',
       long_description=README + "\n\n" + CHANGELOG,
       license='Apache License (2.0)',