Merge branch 'prepare-1.6.0'

Kinto · Oct 14, 2015 · 17017f5 · 17017f5
2 parents 3aaead7 + d550f55
commit 17017f5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,15 +4,17 @@ Changelog
 This document describes changes between each past release.
 
 
-1.6.0 (unreleased)
+1.6.0 (2015-10-14)
 ==================
 
+- Upgraded to *Cliquet* 2.8.1
+
 **Breaking changes**
 
 - Settings prefixed with ``cliquet.`` are now deprecated, and should be replaced
-  with ``kinto.`` instead.
-- In the root url response, public settings are now prefixed with kinto too
-  (e.g. ``kinto.batch_max_requests``).
+  with non prefixed version instead.
+- In the root url response, public settings are exposed without prefix too
+  (e.g. ``batch_max_requests``).
 
 
 1.5.1 (2015-10-07)

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -11,4 +11,3 @@ pytest-cache
 pytest-capturelog
 pytest-cover
 pytest-sugar
-https://github.com/mozilla-services/cliquet/archive/master.zip
diff --git a/docs/conf.py b/docs/conf.py
@@ -75,9 +75,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.5'
+version = '1.6'
 # The full version, including alpha/beta/rc tags.
-release = '1.5.0'
+release = '1.6.0'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

diff --git a/docs/configuration/production.rst b/docs/configuration/production.rst
@@ -39,7 +39,7 @@ adjustments:
 .. note::
 
     For an exhaustive list of available settings and their default values,
-    refer to `the source code <https://github.com/mozilla-services/cliquet/blob/2.7.0/cliquet/__init__.py#L27-L84>`_.
+    refer to `the source code <https://github.com/mozilla-services/cliquet/blob/2.8.1/cliquet/__init__.py#L26-L83>`_.
 
 
 By default, nobody can read buckets list. You can change that using:

diff --git a/setup.py b/setup.py
@@ -16,21 +16,21 @@ def read_file(filename):
 CONTRIBUTORS = read_file('CONTRIBUTORS.rst')
 
 REQUIREMENTS = [
-    'waitress',
-    'cliquet',
-    'jsonschema',
+    'waitress>=0.8,<0.9',
+    'cliquet>=2.8,<2.9',
+    'jsonschema>=2.5,<2.6',
 ]
 
 POSTGRESQL_REQUIREMENTS = REQUIREMENTS + [
-    'cliquet[postgresql]'
+    'cliquet[postgresql]>=2.8,<2.9'
 ]
 
 MONITORING_REQUIREMENTS = REQUIREMENTS + [
-    'cliquet[monitoring]'
+    'cliquet[monitoring]>=2.8,<2.9'
 ]
 
 FXA_REQUIREMENTS = REQUIREMENTS + [
-    'cliquet-fxa'
+    'cliquet-fxa>=1.3,<1.4'
 ]
 
 ENTRY_POINTS = {
@@ -42,7 +42,7 @@ def read_file(filename):
 ]
 
 setup(name='kinto',
-      version='1.6.0.dev0',
+      version='1.6.0',
       description='Kinto Web Service - Store, Sync, Share, and Self-Host.',
       long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
       license='Apache License (2.0)',