Merge pull request #677 from mozilla-services/prepare-3.1.0

Preparing release 3.1.0

Author: leplatrem

CHANGELOG.rst

@@ -4,7 +4,7 @@ Changelog
 This document describes changes between each past release.
 
 
-3.1.0 (unreleased)
+3.1.0 (2016-03-07)
 ------------------
 
 **Protocol**
@@ -15,6 +15,15 @@ This document describes changes between each past release.
 
 - Default console log renderer now has colours (#671)
 
+**Bug fixes**
+
+- Do not always return 412 errors when request header ``If-None-Match: *``
+  is sent on ``POST /collection`` (fixes #673)
+
+**Internal changes**
+
+- Remove some imports at initialization to speed startup (#674)
+
 
 3.0.0 (2016-02-26)
 ------------------

cliquet_docs/conf.py

@@ -63,16 +63,16 @@ def setup(app):
 
 # General information about the project.
 project = u'Cliquet'
-copyright = u'2015, Mozilla Services — Da French Team'
+copyright = u'2015-2016, Mozilla Services — Da French Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '3.0'
+version = '3.1'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.0'
+release = '3.1.0'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

requirements.txt

@@ -1,4 +1,5 @@
 colander==1.2
+colorama==0.3.6
 contextlib2==0.5.1
 cornice==1.2.0
 enum34==1.1.2
@@ -9,8 +10,8 @@ psycopg2==2.6.1
 pyramid==1.6.1
 pyramid-multiauth==0.8.0
 pyramid-tm==0.12.1
-python-dateutil==2.4.2
-raven==5.10.2
+python-dateutil==2.5.0
+raven==5.11.0
 redis==2.10.5
 repoze.lru==0.6
 requests==2.9.1

setup.py

@@ -66,7 +66,7 @@
 
 
 setup(name='cliquet',
-      version='3.1.0.dev0',
+      version='3.1.0',
       description='Micro service API toolkit',
       long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
       license='Apache License (2.0)',