Merge pull request #347 from mozilla-services/prepare-1.2.0

Prepare 1.2.0
Cornices · Jan 18, 2016 · 4c48ec1 · 4c48ec1
2 parents 1178eef + 24fe65c
commit 4c48ec1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,7 +1,18 @@
-1.2.0 (unreleased)
+#########
+CHANGELOG
+#########
+
+
+1.2.0 (2016-01-18)
 ==================
 
-- Nothing changed yet.
+- Adding the ability to define services imperatively. (#335)
+- Clean cornice/statics/ files. (#345)
+
+Bug fixes
+
+- Convert ``None`` to ``colander.null``  before calling colander's ``deserialize`` function. (#342)
+- Allow i18n of colander error messages (#206)
 
 
 1.1.0 (2015-09-29)

diff --git a/setup.py b/setup.py
@@ -24,13 +24,16 @@
         "cornice/+package+/*.*"]}
 
 setup(name='cornice',
-      version='1.2.0.dev0',
+      version='1.2.0',
       description='Define Web Services in Pyramid.',
       long_description=README + '\n\n' + CHANGES,
       license='MPLv2.0',
       classifiers=[
           "Programming Language :: Python",
+          "Programming Language :: Python :: 2.6",
+          "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3",
+          "Programming Language :: Python :: 3.4",
           "Framework :: Pylons",
           "Topic :: Internet :: WWW/HTTP",
           "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",