Skip to content

Commit

Permalink
Merge pull request #781 from Kinto/prepare-4.0.1
Browse files Browse the repository at this point in the history
Preparing release 4.0.1
  • Loading branch information
leplatrem authored Aug 22, 2016
2 parents d816f28 + ff30415 commit 92c519d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Changelog

This document describes changes between each past release.

4.1.0 (unreleased)
4.0.1 (2016-08-22)
------------------

**Bug fixes**
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Contributors
* David Larlet <[email protected]>
* Enguerran <[email protected]>
* Eric Bréhault <[email protected]>
* Eric Le Lay <[email protected]>
* Éric Lemoine <[email protected]>
* Ethan Glasser-Camp <[email protected]>
* Fil <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
# The short X.Y version.
version = '4.0'
# The full version, including alpha/beta/rc tags.
release = '4.0.0'
release = '4.0.1'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jsonschema==2.5.1
newrelic==2.68.0.50
PasteDeploy==1.5.2
psycopg2==2.6.2
pyramid==1.7.2
pyramid==1.7.3
pyramid-multiauth==0.8.0
pyramid-tm==0.12.1
python-dateutil==2.5.3
raven==5.24.3
repoze.lru==0.6
requests==2.11.0
requests==2.11.1
simplejson==3.8.2
six==1.10.0
SQLAlchemy==1.0.14
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def read_file(filename):


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

0 comments on commit 92c519d

Please sign in to comment.