Merge branch 'prepare-1.1.0'

mozilla-services · Oct 14, 2015 · 1eaaa85 · 1eaaa85
2 parents a8304a7 + bbf5a44
commit 1eaaa85
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 22 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,10 +4,17 @@ CHANGELOG
 This document describes changes between each past release.
 
 
-1.1.0 (unreleased)
+1.1.0 (2015-10-14)
 ------------------
 
-- Nothing changed yet.
+- Do not install postgresql dependencies by default.
+- Add statsd metrics on SyncClient response status_code. (#49)
+- Handle the new Firefox Sync sort=oldest parameter. (#46)
+- Rename ids to in_ids to reflect the Kinto protocol. (#50)
+- Make sure Next-Page header keeps QueryString parameters. (#47)
+- Add a Token server heartbeat. (#44)
+- Remove the not accurate Total-Records header when paginating. (#43)
+- Expose the now deprecated cliquet.batch_max_requests settings. (#48)
 
 
 1.0.0 (2015-10-06)

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -7,4 +7,3 @@ requests
 nose
 nose-cov
 nose-mocha-reporter
-https://github.com/mozilla-services/cliquet/archive/master.zip
diff --git a/docs/conf.py b/docs/conf.py
@@ -67,9 +67,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0'
+release = '1.1.0'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

diff --git a/docs/installation.rst b/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.0/cliquet/__init__.py#L26-L83>`_.
+    refer to `cliquet source code <https://github.com/mozilla-services/cliquet/blob/2.8.1/cliquet/__init__.py#L26-L83>`_.
 
-     Click here for `Syncto specific settings <https://github.com/mozilla-services/syncto/blob/master/syncto/__init__.py#L20-L25>`_
+     Click here for `Syncto specific settings <https://github.com/mozilla-services/syncto/blob/1.1.0/syncto/__init__.py#L21-L28>`_
 
 
 Enable write access

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 cffi==1.2.1
-cliquet==2.8.0
+cliquet==2.8.1
 colander==1.0
 cornice==1.1.0
 cryptography==1.0.2
@@ -26,18 +26,18 @@ python-dateutil==2.4.2
 raven==5.7.2
 redis==2.10.3
 repoze.lru==0.6
-requests==2.8.0
-requests-hawk==0.2.0
+requests==2.8.1
+requests-hawk==0.2.1
 simplejson==3.8.0
-six==1.9.0
+six==1.10.0
 statsd==3.1
 structlog==15.3.0
-syncclient==0.5.0
+syncclient==0.6.0
 translationstring==1.3
 ujson==1.33
 venusian==1.0
 waitress==0.8.10
-WebOb==1.4.1
+WebOb==1.5.0
 Werkzeug==0.10.4
 wheel==0.24.0
 zope.deprecation==4.1.2

diff --git a/setup.py b/setup.py
@@ -13,18 +13,18 @@
 
 
 REQUIREMENTS = [
-    'waitress',
-    'cliquet[monitoring]',
-    'hkdf',
-    'PyNaCl',
-    'syncclient',
+    'waitress>=0.8,<0.9',
+    'cliquet[monitoring]>=2.8,<2.9',
+    'hkdf>=0.0.3,<0.1',
+    'PyNaCl>=0.3,<0.4',
+    'syncclient>=0.6,<0.7',
 ]
 
 if PY2:
     REQUIREMENTS += [
-        "pyopenssl",
-        "ndg-httpsclient",
-        "pyasn1"
+        "pyopenssl>=0.15,<0.16",
+        "ndg-httpsclient>=0.4,<0.5",
+        "pyasn1>=0.1,<0.2"
     ]
 
 ENTRY_POINTS = {
@@ -33,7 +33,7 @@
     ]}
 
 setup(name='syncto',
-      version='1.1.0.dev0',
+      version='1.1.0',
       description='Read Firefox Sync server using Kinto API.',
       long_description=README + "\n\n" + CHANGELOG,
       license='Apache License (2.0)',