No love for Python 3.3

.travis.yml

@@ -8,7 +8,6 @@ env:
     PYTHONUNBUFFERED=yes
   matrix:
     - TOXENV=2.7
-    - TOXENV=3.3
     - TOXENV=3.4
     - TOXENV=pypy
     - TOXENV=3.5

README.rst

@@ -4,9 +4,7 @@
 
 .. image:: http://cloud.github.com/downloads/celery/celery/celery_128.png
 
-|build-status| |coverage-status|
-
-:Version: 4.0.0a1 (Cipater)
+:Version: 4.0.0a1 (0today8)
 :Web: http://celeryproject.org/
 :Download: http://pypi.python.org/pypi/celery/
 :Source: http://github.com/celery/celery/
@@ -36,7 +34,7 @@ any language.  So far there's RCelery_ for the Ruby programming language, and a
 `PHP client`, but language interoperability can also be achieved
 by using webhooks.
 
-.. _RCelery: https://github.com/leapfrogonline/rcelery
+.. _RCelery: http://leapfrogdevelopment.github.com/rcelery/
 .. _`PHP client`: https://github.com/gjedeer/celery-php
 .. _`using webhooks`:
     http://docs.celeryproject.org/en/latest/userguide/remote-tasks.html
@@ -46,7 +44,7 @@ What do I need?
 
 Celery version 3.0 runs on,
 
-- Python (2.6, 2.7, 3.3, 3.4)
+- Python (2.7, 3.4, 3.5)
 - PyPy (1.8, 1.9)
 - Jython (2.5, 2.7).
 
@@ -166,26 +164,26 @@ Framework Integration
 Celery is easy to integrate with web frameworks, some of which even have
 integration packages:
 
-    +--------------------+----------------------------------------------------+
-    | `Django`_          | not needed                                         |
-    +--------------------+----------------------------------------------------+
-    | `Pyramid`_         | `pyramid_celery`_                                  |
-    +--------------------+----------------------------------------------------+
-    | `Pylons`_          | `celery-pylons`_                                   |
-    +--------------------+----------------------------------------------------+
-    | `Flask`_           | not needed                                         |
-    +--------------------+----------------------------------------------------+
-    | `web2py`_          | `web2py-celery`_                                   |
-    +--------------------+----------------------------------------------------+
-    | `Tornado`_         | `tornado-celery`_ | `another tornado-celery`_      |
-    +--------------------+----------------------------------------------------+
+    +--------------------+------------------------+
+    | `Django`_          | not needed             |
+    +--------------------+------------------------+
+    | `Pyramid`_         | `pyramid_celery`_      |
+    +--------------------+------------------------+
+    | `Pylons`_          | `celery-pylons`_       |
+    +--------------------+------------------------+
+    | `Flask`_           | not needed             |
+    +--------------------+------------------------+
+    | `web2py`_          | `web2py-celery`_       |
+    +--------------------+------------------------+
+    | `Tornado`_         | `tornado-celery`_      |
+    +--------------------+------------------------+
 
 The integration packages are not strictly necessary, but they can make
 development easier, and sometimes they add important hooks like closing
 database connections at ``fork``.
 
 .. _`Django`: http://djangoproject.com/
-.. _`Pylons`: http://www.pylonsproject.org/
+.. _`Pylons`: http://pylonsproject.org/
 .. _`Flask`: http://flask.pocoo.org/
 .. _`web2py`: http://web2py.com/
 .. _`Bottle`: http://bottlepy.org/
@@ -196,7 +194,6 @@ database connections at ``fork``.
 .. _`web2py-celery`: http://code.google.com/p/web2py-celery/
 .. _`Tornado`: http://www.tornadoweb.org/
 .. _`tornado-celery`: http://github.com/mher/tornado-celery/
-.. _`another tornado-celery`: https://github.com/mayflaver/tornado-celery
 
 .. _celery-documentation:
 
@@ -287,14 +284,20 @@ Transports and Backends
     for using memcached as a result backend.
 
 :celery[cassandra]:
-    for using Apache Cassandra as a result backend.
+    for using Apache Cassandra as a result backend with pycassa driver.
+
+:celery[new_cassandra]:
+    for using Apache Cassandra as a result backend with DataStax driver.
 
 :celery[couchdb]:
     for using CouchDB as a message transport (*experimental*).
 
 :celery[couchbase]:
     for using CouchBase as a result backend.
 
+:celery[riak]:
+    for using Riak as a result backend.
+
 :celery[beanstalk]:
     for using Beanstalk as a message transport (*experimental*).
 
@@ -396,26 +399,6 @@ Wiki
 
 http://wiki.github.com/celery/celery/
 
-
-.. _maintainers:
-
-Maintainers
-===========
-
-- `@ask`_ (primary maintainer)
-- `@thedrow`_
-- `@chrisgogreen`_
-- `@PMickael`_
-- `@malinoff`_
-- And you? We really need more: https://github.com/celery/celery/issues/2534 
-
-.. _`@ask`: http://github.com/ask
-.. _`@thedrow`: http://github.com/thedrow
-.. _`@chrisgogreen`: http://github.com/chrisgogreen
-.. _`@PMickael`: http://github.com/PMickael
-.. _`@malinoff`: http://github.com/malinoff
-
-
 .. _contributing-short:
 
 Contributing
@@ -448,7 +431,3 @@ file in the top distribution directory for the full license text.
     :alt: Bitdeli badge
     :target: https://bitdeli.com/free
 
-.. |build-status| image:: https://travis-ci.org/celery/celery.svg?branch=master
-   :target: https://travis-ci.org/celery/celery
-.. |coverage-status| image:: https://codecov.io/gh/celery/celery/badge.svg
-   :target: https://codecov.io/gh/celery/celery

docs/getting-started/introduction.rst

@@ -37,9 +37,9 @@ What do I need?
 ===============
 
 .. sidebar:: Version Requirements
-    :subtitle: Celery version 3.0 runs on
+    :subtitle: Celery version 4.0 runs on
 
-    - Python ❨2.5, 2.6, 2.7, 3.2, 3.3, 3.4❩
+    - Python ❨2.7, 3.4, 3.5❩
     - PyPy ❨1.8, 1.9❩
     - Jython ❨2.5, 2.7❩.
 

docs/includes/introduction.txt

@@ -38,7 +38,7 @@ What do I need?
 
 Celery version 3.0 runs on,
 
-- Python (2.6, 2.7, 3.3, 3.4)
+- Python (2.7, 3.4, 3.5)
 - PyPy (1.8, 1.9)
 - Jython (2.5, 2.7).
 

docs/whatsnew-4.0.rst

@@ -28,7 +28,7 @@ To read more about Celery you should go read the :ref:`introduction <intro>`.
 While this version is backward compatible with previous versions
 it's important that you read the following section.
 
-This version is officially supported on CPython 2.6, 2.7 and 3.3,
+This version is officially supported on CPython 2.7, 3.4 and 3.5.
 and also supported on PyPy.
 
 .. _`website`: http://celeryproject.org/

setup.py

@@ -12,6 +12,8 @@
 
 if sys.version_info < (2, 7):
     raise Exception('Celery 4.0 requires Python 2.7 or higher.')
+elif sys.version_info > (3, ) < (3, 4):
+    raise Exception('Celery 4.0 requires Python 3.4 or higher.')
 
 # -*- Upgrading from older versions -*-
 
@@ -65,7 +67,6 @@
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: Implementation :: CPython
@@ -173,18 +174,16 @@ def extras(*p):
     return reqs('extras', *p)
 
 # Celery specific
-features = {
+features = set([
     'auth', 'cassandra', 'memcache', 'couchbase', 'threads',
     'eventlet', 'gevent', 'msgpack', 'yaml', 'redis',
     'mongodb', 'sqs', 'couchdb', 'riak', 'beanstalk', 'zookeeper',
     'zeromq', 'sqlalchemy', 'librabbitmq', 'pyro', 'slmq',
     'new_cassandra',
-}
-extras_require = {x: extras(x + '.txt') for x in features}
+])
+extras_require = dict((x, extras(x + '.txt')) for x in features)
 extra['extras_require'] = extras_require
 
-print(tests_require)
-
 # -*- %%% -*-
 
 setup(

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = 2.7,pypy,3.3,3.4,3.5,pypy3
+envlist = 2.7,pypy,3.4,3.5,pypy3
 
 [testenv]
 deps=
@@ -8,8 +8,8 @@ deps=
     2.7,pypy: -r{toxinidir}/requirements/test.txt
     2.7: -r{toxinidir}/requirements/test-ci-default.txt
 
-    3.3,3.4,3.5,pypy3: -r{toxinidir}/requirements/test3.txt
-    3.3,3.4,3.5: -r{toxinidir}/requirements/test-ci-default.txt
+    3.4,3.5,pypy3: -r{toxinidir}/requirements/test3.txt
+    3.4,3.5: -r{toxinidir}/requirements/test-ci-default.txt
 
     pypy,pypy3: -r{toxinidir}/requirements/test-ci-base.txt
     pypy3: -r{toxinidir}/requirements/test-pypy3.txt
@@ -21,7 +21,6 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
 basepython =
     2.7: python2.7
-    3.3: python3.3
     3.4: python3.4
     3.5: python3.5
     pypy: pypy