Skip to content

Commit

Permalink
Merge pull request #845 from Kinto/prepare-4.3.0
Browse files Browse the repository at this point in the history
Prepare 4.3.0
  • Loading branch information
leplatrem authored Oct 4, 2016
2 parents bb8e66d + 76918a3 commit 6403e2b
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 7 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.3.0 (unreleased)
4.3.0 (2016-10-04)
------------------

**Protocol**
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ Contributors
* Aaron Egaas <[email protected]>
* Adam Chainz <[email protected]>
* Aditya Bhasin <[email protected]>
* Anh <[email protected]>
* Alexis Metaireau <[email protected]>
* Andy McKay <[email protected]>
* Aymeric Faivre <[email protected]>
* Ayush Sharma <[email protected]>
* Balthazar Rouberol <[email protected]>
* Boris Feld <[email protected]>
* Castro
* Chirag B. Jadwani <[email protected]>
* Clément Villain <[email protected]>
* Dan Phrawzty <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ API
Changelog
---------

1.11 (unreleased)
1.11 (2016-10-04)
'''''''''''''''''

- Parent attributes are now readable if children creation is allowed
Expand Down
2 changes: 1 addition & 1 deletion docs/community.rst
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ Step 1
- Merge remaining pull requests
- Update ``CHANGELOG.rst``
- If API was updated, update API changelog in :file:`docs/api/index.rst`
- Make sure ``HTTP_API_VERSION`` is up-to-date in kinto/__init__.py``
- Make sure ``HTTP_API_VERSION`` is up-to-date in :file:`kinto/__init__.py`
- Update the link in :file:`docs/configuration/production.rst`
- Update :file:`CONTRIBUTORS.rst`. The following hairy command will output the full list:

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
# built documents.
#
# The short X.Y version.
version = '4.2'
version = '4.3'
# The full version, including alpha/beta/rc tags.
release = '4.2.0'
release = '4.3.0'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pyramid==1.7.3
pyramid-multiauth==0.8.0
pyramid-tm==1.0
python-dateutil==2.5.3
raven==5.26.0
raven==5.27.1
repoze.lru==0.6
requests==2.11.1
simplejson==3.8.2
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.3.0.dev0',
version='4.3.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)',
Expand Down

0 comments on commit 6403e2b

Please sign in to comment.