Merge remote-tracking branch 'origin/prepare-1.2'

Kinto · Jul 3, 2015 · d2f8869 · d2f8869
2 parents 3261d67 + c58393a
commit d2f8869
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,10 +4,34 @@ Changelog
 This document describes changes between each past release.
 
 
-1.2.0 (unreleased)
+1.2.0 (2015-07-03)
 ==================
 
-- Nothing changed yet.
+- Upgraded to *Cliquet* 2.2.+
+
+**New features**
+
+- Add the personal bucket ``/buckets/default``, where collections are created
+  implicitly (#71)
+- *Kinto* now uses the memory backend by default, which simplifies its usage
+  for development (#86, #95)
+- Add public settings in hello view (mozilla-services/cliquet#318)
+
+**Bug fixes**
+
+- Fix Docker compose file settings (#100)
+- Fix version redirection behaviour for unsupported versions (mozilla-services/cliquet#341)
+- Fix overriding backend settings in .ini (mozilla-services/cliquet#343)
+
+**Internal changes**
+
+- Documentation improvements (#75)
+- Added tutorial (#79)
+- Remove hard dependency on *PostgreSQL* (#100)
+- Add pytest-cache (#98)
+- Add Pypy test on Travis (#99)
+- Update dependencies on ``make install`` (#97)
+- Fix URL of readthedocs.org (#90)
 
 
 1.1.0 (2015-06-29)

diff --git a/docs/conf.py b/docs/conf.py
@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.2.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.rst b/docs/configuration.rst
@@ -37,7 +37,7 @@ Also, the set of settings mentionned below might deserve some review or adjustme
 :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.0.0/cliquet/__init__.py#L26-L78>`_.
+    refer to `the source code <https://github.com/mozilla-services/cliquet/blob/2.2.0/cliquet/__init__.py#L26-L78>`_.
 
 
 Monitoring

diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@ def read_file(filename):
 
 REQUIREMENTS = [
     'waitress',
-    'cliquet'
+    'cliquet >= 2.2.0'
 ]
 
 POSTGRESQL_REQUIREMENTS = REQUIREMENTS + [
@@ -41,7 +41,7 @@ def read_file(filename):
 ]
 
 setup(name='kinto',
-      version='1.2.0.dev0',
+      version='1.2.0',
       description='kinto',
       long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
       license='Apache License (2.0)',