Merge pull request Kinto#699 from Kinto/prepare-3.3.0

Prepare 3.3.0
jlong49 · Jul 18, 2016 · 68820e1 · 68820e1
2 parents ae8fbea + 90bfd4c
commit 68820e1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 12 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,7 +3,7 @@ Changelog
 
 This document describes changes between each past release.
 
-3.3.0 (unreleased)
+3.3.0 (2016-07-18)
 ==================
 
 **Protocol**

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -1,6 +1,7 @@
 Contributors
 ============
 
+* Adam Chainz <[email protected]>
 * Aaron Egaas <[email protected]>
 * Aditya Bhasin <[email protected]>
 * Alexis Metaireau <[email protected]>

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -10,7 +10,7 @@ requests
 sphinx_rtd_theme
 sphinxcontrib-httpdomain
 Sphinx
-SQLAlchemy<1.1.0b1
+SQLAlchemy
 tox
 unittest2
 WebTest

diff --git a/docs/community.rst b/docs/community.rst
@@ -231,6 +231,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``
 - Update the link in :file:`docs/configuration/production.rst`
 - Update :file:`CONTRIBUTORS.rst`. The following hairy command will output the full list:
 
@@ -273,7 +274,17 @@ As a final step:
 - Close the milestone in Github
 - Create next milestone in Github in the case of a major release
 - Add entry in Github release page
-- Configure the version in ReadTheDocs
+- Check that the version in ReadTheDocs is up-to-date
+- Check that a Docker image was built
 - Send mail to ML (If major release)
+- Tweet about it!
+
+Upgrade:
+
+- Deploy new version on demo server
+- Upgrade dependency in ``kinto-dist`` repo
+- Upgrade version targetted in ``kinto-heroku`` repo
+- Upgrade version of Kinto server for the tests of clients and plugins repos
+  (*kinto-http.js, kinto-http.py, kinto-attachment, etc.*)
 
 That's all folks!
diff --git a/docs/conf.py b/docs/conf.py
@@ -72,9 +72,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.2'
+version = '3.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.2.0'
+release = '3.3.0'
 
 # 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
@@ -9,18 +9,18 @@ iso8601==0.1.11
 jsonschema==2.5.1
 newrelic==2.66.0.49
 PasteDeploy==1.5.2
-psycopg2==2.6.1
+psycopg2==2.6.2
 pyramid==1.7
 pyramid-multiauth==0.8.0
 pyramid-tm==0.12.1
 python-dateutil==2.5.3
-raven==5.21.0
+raven==5.23.0
 redis==2.10.5
 repoze.lru==0.6
 requests==2.10.0
 simplejson==3.8.2
 six==1.10.0
-SQLAlchemy==1.0.13
+SQLAlchemy==1.0.14
 statsd==3.2.1
 structlog==16.1.0
 transaction==1.6.1
@@ -32,4 +32,4 @@ WebOb==1.6.1
 Werkzeug==0.11.10
 zope.deprecation==4.1.2
 zope.interface==4.2.0
-zope.sqlalchemy==0.7.6
+zope.sqlalchemy==0.7.7
diff --git a/setup.py b/setup.py
@@ -37,15 +37,15 @@ def read_file(filename):
     # We install psycopg2cffi instead of psycopg2 when dealing with pypy
     # Note: JSONB support landed after psycopg2cffi 2.7.0
     POSTGRESQL_REQUIRES = [
-        'SQLAlchemy<1.1.0b1',  # zopefoundation/zope.sqlalchemy#15
+        'SQLAlchemy',
         'psycopg2cffi>2.7.0',
         'zope.sqlalchemy',
     ]
 else:
     # ujson is not pypy compliant, as it uses the CPython C API
     REQUIREMENTS.append('ujson >= 1.35')
     POSTGRESQL_REQUIRES = [
-        'SQLAlchemy<1.1.0b1',  # zopefoundation/zope.sqlalchemy#15
+        'SQLAlchemy',
         'psycopg2>2.5',
         'zope.sqlalchemy',
     ]
@@ -71,7 +71,7 @@ def read_file(filename):
 
 
 setup(name='kinto',
-      version='3.3.0.dev0',
+      version='3.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)',