Merge pull request #602 from mozilla-services/prepare-2.12

Prepare 2.12

Author: leplatrem

CHANGELOG.rst

@@ -4,9 +4,19 @@ Changelog
 This document describes changes between each past release.
 
 
-2.12.0 (unreleased)
+2.12.0 (2015-11-27)
 -------------------
 
+**Protocol**
+
+Minor changes in the root URL (hello view):
+
+- Added ``http_api_version`` (#600)
+- Renamed ``hello`` to ``project_name``
+- Renamed ``protocol_version`` to ``cliquet_protocol_version``
+- Renamed ``documentation`` to ``project_docs``
+- Renamed ``version`` to ``project_version``
+
 **Breaking changes**
 
 - When using *cliquet-fxa*, the setting ``multiauth.policy.fxa.use`` must now
@@ -26,16 +36,15 @@ This document describes changes between each past release.
   resource names (#492, #555)
 - Add ability to listen to read action on resource (disabled by default)
   (#493)
-- Added the ``http_api_version`` in the root view (#600)
-
 
 **Internal**
 
 - Fixed a few details in quickstart docs since backends are not Redis by default
   anymore
 - Replace usage of ``assert`` by explicit exceptions since the former can
   be ignored when python is ran with ``-O`` (fixes #592)
-
+- Improved documentation about permissions (#572, thanks for the feedback @MrChoclate)
+- Fixed docs building under Python 3 (#591)
 
 
 2.11.0 (2015-11-17)

cliquet_docs/conf.py

@@ -70,9 +70,9 @@ def setup(app):
 # built documents.
 #
 # The short X.Y version.
-version = '2.11'
+version = '2.12'
 # The full version, including alpha/beta/rc tags.
-release = '2.11.0'
+release = '2.12.0'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

requirements.txt

@@ -1,12 +1,12 @@
 colander==1.0
 cornice==1.1.0
 iso8601==0.1.11
-newrelic==2.58.0.43
+newrelic==2.58.2.45
 PasteDeploy==1.5.2
 psycopg2==2.6.1
 pyramid==1.5.7
 pyramid-multiauth==0.5.0
-pyramid-tm==0.12
+pyramid-tm==0.12.1
 python-dateutil==2.4.2
 raven==5.8.1
 redis==2.10.5

setup.py

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