Skip to content

Commit

Permalink
Preparing release 6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
leplatrem committed Mar 3, 2017
1 parent 3443f16 commit a2c06c8
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 15 deletions.
12 changes: 6 additions & 6 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ Changelog

This document describes changes between each past release.

6.0.0 (unreleased)
6.0.0 (2017-03-03)
------------------

**Breaking changes**

- Remove Python 2.7 support and upgrade to Python 3.5. (#1050)
- Upgraded minimal PostgreSQL support to PostgreSQL 9.5 (#1056)

**Protocol**

- Fixed ``If-Match`` behavior to match the RFC 2616 specification (#1102).
Expand All @@ -14,11 +19,6 @@ This document describes changes between each past release.

Protocol is now at version **1.15**. See `API changelog`_.

**Breaking changes**

- Remove Python 2.7 support and upgrade to Python 3.5. (#1050)
- Upgraded minimal PostgreSQL support to PostgreSQL 9.5 (#1056)

**Bug fixes**

- Prevent injections in the PostgreSQL permission backend (#1061)
Expand Down
3 changes: 3 additions & 0 deletions CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ Contributors
* FooBarQuaxx
* Greeshma <[email protected]>
* Gabriela Surita <[email protected]>
* Greg Guthe <[email protected]>
* Hiromipaw <[email protected]>
* Indranil Dutta <[email protected]>
* Jelmer van der Ploeg <[email protected]>
* Joël Marty
* John Giannelos <[email protected]>
* Joshua Bird <[email protected]>
* Julien Bouquillon <[email protected]>
* Lavish Aggarwal <[email protected]>
* Maksym Shalenyi <[email protected]>
Expand All @@ -41,6 +43,7 @@ Contributors
* Michael Charlton <[email protected]>
* Michiel de Jong <[email protected]>
* Mo Valipour <[email protected]>
* Mozillazg
* Nicolas Hoizey <[email protected]>
* Nicolas Perriault <[email protected]>
* Niraj <https://github.com/niraj8>
Expand Down
3 changes: 2 additions & 1 deletion docs/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ API
Changelog
---------

1.15 (Unreleased)
1.15 (2017-03-03)
'''''''''''''''''

- ``If-Match`` and ``If-None-Match`` precondition headers now check the ETag for
strict equality. Previous versions would allow requests if they seemed
to be more recent than the current version.
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@
# built documents.
#
# The short X.Y version.
version = '5.3'
version = '6.0'
# The full version, including alpha/beta/rc tags.
release = '5.3.1'
release = '6.0.0'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
9 changes: 4 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
appdirs==1.4.0
appdirs==1.4.2
colander==1.3.2
colorama==0.3.7
contextlib2==0.5.4
cornice==2.4.0
cornice-swagger==0.5.0
enum34==1.1.6
hupper==0.4.2
iso8601==0.1.11
jsonpatch==1.15
jsonpointer==1.10
jsonschema==2.6.0
newrelic==2.78.0.57
newrelic==2.80.1.61
packaging==16.8
PasteDeploy==1.5.2
psycopg2==2.6.2
psycopg2==2.7
pyparsing==2.1.10
pyramid==1.8.2
pyramid-multiauth==0.9.0
Expand All @@ -24,7 +23,7 @@ repoze.lru==0.6
requests==2.13.0
simplejson==3.10.0
six==1.10.0
SQLAlchemy==1.1.5
SQLAlchemy==1.1.6
statsd==3.2.1
structlog==16.1.0
transaction==2.1.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def read_file(filename):


setup(name='kinto',
version='6.0.0.dev0',
version='6.0.0',
description='Kinto Web Service - Store, Sync, Share, and Self-Host.',
long_description="{}\n\n{}\n\n{}".format(README, CHANGELOG, CONTRIBUTORS),
license='Apache License (2.0)',
Expand Down

0 comments on commit a2c06c8

Please sign in to comment.