Merge pull request #404 from Cornices/prepare-release-2.0.1

Prepare release 2.0.1

CHANGES.txt

@@ -3,13 +3,15 @@ CHANGELOG
 #########
 
 
-2.1.0 (unreleased)
+2.0.1 (2016-10-24)
 ==================
 
 **Bug fixes**
 
+- Fix Colander imports to make sure it remains optional (#400)
 - Fix truncated JSON validation error message when request body does not contain
-  valid JSON
+  valid JSON (#401)
+- Fix docs about upgrading deserializers (#402)
 
 
 2.0.0 (2016-10-20)

docs/source/conf.py

@@ -7,13 +7,13 @@
     print("please install the 'mozilla-sphinx-theme' distribution")
 
 sys.path.insert(0, os.path.abspath("../.."))  # include cornice from the source
-extensions = ['sphinx.ext.autodoc']
+extensions = []
 
 templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'Cornice'
-copyright = u'2011, Mozilla Services'
+copyright = u'2011-2016, Mozilla Services'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -22,7 +22,7 @@
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.0'
+release = '2.0.1'
 
 exclude_patterns = []
 

setup.py

@@ -15,7 +15,7 @@
 package_data = {}
 
 setup(name='cornice',
-      version='2.1.0.dev0',
+      version='2.0.1',
       description='Define Web Services in Pyramid.',
       long_description=README + '\n\n' + CHANGES,
       license='MPLv2.0',