Merge branch 'prepare-4.0.0'

Kinto · Aug 17, 2016 · 5f414d0 · 5f414d0
2 parents 094d1ac + 4f11066
commit 5f414d0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,7 +3,7 @@ Changelog
 
 This document describes changes between each past release.
 
-4.0.0 (unreleased)
+4.0.0 (2016-08-17)
 ------------------
 
 **Breaking changes**
@@ -26,6 +26,8 @@ This document describes changes between each past release.
 - Allow sub-object filtering on plural endpoints (e.g ``?person.name=Eliot``) (#345)
 - Allow sub-object sorting on plural endpoints (e.g ``?_sort=person.name``) (#345)
 
+Protocol is now at version **1.9**. See `API changelog`_.
+
 **New features**
 
 - Added a new built-in plugin ``kinto.plugins.history`` that keeps track of every action
@@ -41,7 +43,6 @@ This document describes changes between each past release.
 
 **Bug fixes**
 
-- Fix Redis get_accessible_object implementation (#725)
 - Fix bug where the resource events of a request targetting two groups/collection
   from different buckets would be grouped together.
 - Fix crash when an invalid UTF-8 character is provided in URL
@@ -64,7 +65,7 @@ This document describes changes between each past release.
   parameter anymore
 - Improved parts of the FAQ (#744)
 - Improve 404 and 403 error handling to make them customizable. (#748)
-- ``kinto.core`` resources are not schemaless by default (fixes #719)
+- ``kinto.core`` resources are now schemaless by default (fixes #719)
 
 
 3.3.1 (2016-07-19)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -30,7 +30,7 @@ Contributors
 * Masataka Takeuchi <[email protected]>
 * Mathieu Agopian <[email protected]>
 * Mathieu Leplatre <[email protected]>
-* Maxime Varnier <[email protected]>
+* Maxime Warnier <[email protected]>
 * Michiel de Jong <[email protected]>
 * Nicolas Hoizey <[email protected]>
 * Nicolas Perriault <[email protected]>

diff --git a/docs/api/index.rst b/docs/api/index.rst
@@ -11,7 +11,7 @@ API
 Changelog
 ---------
 
-1.9 (unreleased)
+1.9 (2016-08-17)
 ''''''''''''''''
 
 - Add new endpoint ``GET /__version__`` to retrieve the information

diff --git a/docs/conf.py b/docs/conf.py
@@ -72,9 +72,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.3'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.3.0'
+release = '4.0.0'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

diff --git a/docs/configuration/production.rst b/docs/configuration/production.rst
@@ -129,7 +129,7 @@ adjustments:
 .. note::
 
     For an exhaustive list of available settings and their default values,
-    refer to the *Kinto* :github:`source code <Kinto/kinto/blob/3.3.1/kinto/core/__init__.py#L23-L89>`.
+    refer to the *Kinto* :github:`source code <Kinto/kinto/blob/4.0.0/kinto/core/__init__.py#L23-L90>`.
 
 
 By default, nobody can read buckets list. You can change that using:

diff --git a/requirements.txt b/requirements.txt
@@ -1,23 +1,22 @@
 colander==1.3.1
 colorama==0.3.7
-contextlib2==0.5.3
+contextlib2==0.5.4
 cornice==1.2.1
 enum34==1.1.6
 functools32==3.2.3.post2
 futures==3.0.5
 iso8601==0.1.11
 jsonschema==2.5.1
-newrelic==2.66.0.49
+newrelic==2.68.0.50
 PasteDeploy==1.5.2
 psycopg2==2.6.2
-pyramid==1.7
+pyramid==1.7.2
 pyramid-multiauth==0.8.0
 pyramid-tm==0.12.1
 python-dateutil==2.5.3
-raven==5.23.0
-redis==2.10.5
+raven==5.24.3
 repoze.lru==0.6
-requests==2.10.0
+requests==2.11.0
 simplejson==3.8.2
 six==1.10.0
 SQLAlchemy==1.0.14

diff --git a/setup.py b/setup.py
@@ -75,7 +75,7 @@ def read_file(filename):
 
 
 setup(name='kinto',
-      version='3.4.0.dev0',
+      version='4.0.0',
       description='Kinto Web Service - Store, Sync, Share, and Self-Host.',
       long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
       license='Apache License (2.0)',