diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3e7d9049..c7e4f7b9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,7 @@ Changelog This document describes changes between each past release. -3.2.0 (unreleased) +3.1.3 (2016-04-29) ------------------ **Bug fixes** @@ -12,6 +12,10 @@ This document describes changes between each past release. - Fix migration of triggers in PostgreSQL storage backend when upgrading from <3.0.0. Running the ``migrate`` command will basically re-create them (fixes Kinto/kinto#559) +**Documentation** + +- Fix some typos in documentation (#696) + 3.1.2 (2016-04-19) ------------------ diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index b21cee88..d1a16fbf 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -8,6 +8,7 @@ Contributors * Clément Villain * Dan Phrawzty * Éric Lemoine +* Ethan Glasser-Camp * FooBarQuaxx * Greeshma * Hiromipaw diff --git a/cliquet_docs/conf.py b/cliquet_docs/conf.py index a075a55a..acd74fc3 100644 --- a/cliquet_docs/conf.py +++ b/cliquet_docs/conf.py @@ -72,7 +72,7 @@ def setup(app): # The short X.Y version. version = '3.1' # The full version, including alpha/beta/rc tags. -release = '3.1.1' +release = '3.1.3' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. diff --git a/requirements.txt b/requirements.txt index 40cee05e..3e54cac1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,16 +2,16 @@ colander==1.2 colorama==0.3.7 contextlib2==0.5.1 cornice==1.2.1 -enum34==1.1.2 +enum34==1.1.4 iso8601==0.1.11 -newrelic==2.62.0.47 +newrelic==2.64.0.48 PasteDeploy==1.5.2 psycopg2==2.6.1 pyramid==1.6.1 pyramid-multiauth==0.8.0 pyramid-tm==0.12.1 -python-dateutil==2.5.2 -raven==5.12.0 +python-dateutil==2.5.3 +raven==5.13.0 redis==2.10.5 repoze.lru==0.6 requests==2.9.1 @@ -25,7 +25,8 @@ translationstring==1.3 ujson==1.35 venusian==1.0 WebOb==1.6.0 -Werkzeug==0.11.5 +Werkzeug==0.11.9 +wheel==0.24.0 zope.deprecation==4.1.2 zope.interface==4.1.3 zope.sqlalchemy==0.7.6 diff --git a/setup.py b/setup.py index 8b43d283..c5037b9e 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ setup(name='cliquet', - version='3.2.0.dev0', + version='3.1.3', description='Micro service API toolkit', long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS, license='Apache License (2.0)',