Merge pull request Cornices#355 from mozilla-services/prepare-release…

…-1.2.1

Preparing release 1.2.1

CHANGES.txt

@@ -3,12 +3,21 @@ CHANGELOG
 #########
 
 
-1.3.0 (unreleased)
+1.2.1 (2016-03-15)
 ==================
 
-- Nothing changed yet.
-- Properly handle content_type callables returning a single internet media type as scalar (#343)
-- Improve documentation regarding content type negotiation and media type validation (#91, #343, #350)
+Bug fixes
+
+- Properly handle content_type callables returning a single internet media type
+  as scalar. Thanks @amotl (#343)
+- Do not raise a 415 error when no content-type and no body (#354)
+
+Documentation
+
+- Improve documentation regarding content type negotiation and media type
+  validation. Thanks @amotl (#91, #343, #350)
+- Fix typo in testing docs. Thanks peletiah (#348)
+- Clarify docs for deferred colander validator. Thanks @antoineleclair (#352)
 
 
 1.2.0 (2016-01-18)

CONTRIBUTORS.txt

@@ -5,12 +5,14 @@ Cornice:
 * Alex Marandon <[email protected]>
 * Andre Caron <[email protected]>
 * Andreas Motl <[email protected]>
+* Antoine Leclair <[email protected]>
 * Anton D <anton@screwtop>
 * Areski Belaid <[email protected]>
 * Ben Bangert <[email protected]>
 * Bruno Binet <[email protected]>
 * Bryan Zegar <[email protected]>
-* David Charboneau 
+* Christian Benke <[email protected]>
+* David Charboneau
 * Gael Pasgrimaud <[email protected]>
 * Janek Hiis <[email protected]>
 * Josip Delic <[email protected]>

docs/source/conf.py

@@ -20,9 +20,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.1'
 
 exclude_patterns = []
 

setup.py

@@ -24,7 +24,7 @@
         "cornice/+package+/*.*"]}
 
 setup(name='cornice',
-      version='1.3.0.dev0',
+      version='1.2.1',
       description='Define Web Services in Pyramid.',
       long_description=README + '\n\n' + CHANGES,
       license='MPLv2.0',