Merge branch 'prepare-1.5.0'

Kinto · Sep 25, 2015 · c6080b5 · c6080b5
2 parents 3b49d06 + e245e14
commit c6080b5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,10 +4,25 @@ Changelog
 This document describes changes between each past release.
 
 
-1.5.0 (unreleased)
+1.5.0 (2015-09-23)
 ==================
 
-- Nothing changed yet.
+- Add Disqus comments to documentation (fixes #159)
+
+**New features**
+
+- Allow POST to create buckets (fixes #64)
+- Control client cache headers from settings or collection objects (#189)
+
+**Internal changes**
+
+- Remove dead code (#187, ref #53)
+- Add pytest-capturelog for better output on test failures (#191)
+- Install cliquet middleware (*no-op if disabled*) (#193)
+- Many optimizations on ``default`` bucket (#192, #197)
+- Many optimizations on number of storage hits (#203)
+- Fix contributing docs about tests (#198)
+- Added more batched actions to loadtests (#199)
 
 
 1.4.0 (2015-09-04)

diff --git a/docs/conf.py b/docs/conf.py
@@ -75,9 +75,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.4'
+version = '1.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.0'
+release = '1.5.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.5.0/cliquet/__init__.py#L27-L81>`_.
+    refer to `the source code <https://github.com/mozilla-services/cliquet/blob/2.7.0/cliquet/__init__.py#L27-L84>`_.
 
 
 By default, nobody can read buckets list. You can change that using:

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 cffi==1.2.1
-cliquet==2.5.0
+cliquet==2.7.0
 cliquet-fxa==1.2.0
 colander==1.0
 cornice==1.0.0

diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@ def read_file(filename):
 ]
 
 setup(name='kinto',
-      version='1.5.0.dev0',
+      version='1.5.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)',