Merge branch '3.0'

Conflicts:
	README.rst
	celery/__init__.py
	docs/includes/introduction.txt
	requirements/README.rst
	requirements/default.txt
	setup.cfg
	setup.py
	tox.ini

Changelog

@@ -41,6 +41,16 @@ If you're looking for versions prior to 3.x you should see :ref:`history`.
         >>> from djcelery.models import PeriodicTask
         >>> PeriodicTask.objects.update(last_run_at=None)
 
+    You also have to do this if you change the timezone or
+    :setting:`CELERY_ENABLE_UTC` setting.
+
+- Note about the :setting:`CELERY_ENABLE_UTC` setting.
+
+    If you previously disabled this just to force periodic tasks to work with
+    your timezone, then you are now *encouraged to re-enable it*.
+
+- Now depends on Kombu 2.4.5 which fixes PyPy + Jython installation.
+
 - Fixed bug with timezones when :setting:`CELERY_ENABLE_UTC` is disabled
   (Issue #952).
 

docs/getting-started/brokers/django.rst

@@ -21,9 +21,9 @@ configuration values.
 
     BROKER_URL = 'django://'
 
-#. Add :mod:`djcelery.transport` to `INSTALLED_APPS`::
+#. Add :mod:`kombu.transport.django` to `INSTALLED_APPS`::
 
-    INSTALLED_APPS = ('djcelery.transport', )
+    INSTALLED_APPS = ('kombu.transport.django', )
 
 #. Sync your database schema:
 

requirements/README.rst

@@ -6,18 +6,46 @@
 Index
 =====
 
-* `requirements/default.txt`
+* :file:`requirements/default.txt`
 
-    The default requirements (Python 2.7+).
+    Default requirements for Python 2.7+.
 
-* `requirements/py26.txt`
+* :file:`requirements/default-py3k.txt`
+
+    Default requirements for Python 3.2+.
+
+* :file:`requirements/py26.txt`
 
     Extra requirements needed to run on Python 2.6.
 
-* `requirements/test.txt`
+* :file:`requirements/jython.txt`
+
+    Extra requirements needed to run on Jython 2.5
+
+* :file:`requirements/security.txt`
+
+    Extra requirements needed to use the message signing serializer,
+    see the Security Guide.
+
+* :file:`requirements/test.txt`
 
     Requirements needed to run the full unittest suite.
 
+* :file:`requirements/test-ci.txt`
+
+    Extra test requirements required by the CI suite (Tox).
+
+* :file:`requirements/doc.txt`
+
+    Extra requirements required to build the Sphinx documentation.
+
+* :file:`requirements/pkgutils.txt`
+
+    Extra requirements required to perform package distribution maintenance.
+
+* :file:`requirements/dev.txt`
+
+    Requirement file installing the current master branch of Celery and deps.
 
 
 Examples

requirements/default-py3k.txt

@@ -1,4 +1,4 @@
 billiard>=2.7.3.12
 python-dateutil>=2.1
 pytz
-kombu>=2.4.4,<3.0
+kombu>=2.4.5,<3.0

requirements/default.txt

@@ -1,3 +1,8 @@
 billiard>=2.7.3.12
+<<<<<<< HEAD
 python-dateutil>=2.1
 kombu>=2.4.4,<3.0
+=======
+python-dateutil>=1.5,<2.0
+kombu>=2.4.5,<3.0
+>>>>>>> 3.0

requirements/test-ci.txt

@@ -0,0 +1,5 @@
+coverage>=3.0
+redis
+pymongo
+SQLAlchemy
+PyOpenSSL

requirements/test-py3k.txt

@@ -1,6 +0,0 @@
-distribute
-nose
-nose-cover3
-coverage>=3.0
-mock>=0.7.0
-SQLAlchemy

requirements/test-pypy.txt

@@ -1,4 +0,0 @@
-nose
-nose-cover3
-coverage>=3.0
-mock>=0.7.0

setup.cfg

@@ -18,5 +18,5 @@ requires = uuid
            importlib
            billiard >= 2.7.3.12
            python-dateutil >= 2.1
-           kombu >= 2.4.4
+           kombu >= 2.4.5
            ordereddict

setup.py

@@ -160,12 +160,7 @@ if py_version[0:2] == (2, 6):
 
 # -*- Tests Requires -*-
 
-if is_py3k:
-    tests_require = reqs('test-py3k.txt')
-elif is_pypy:
-    tests_require = reqs('test-pypy.txt')
-else:
-    tests_require = reqs('test.txt')
+tests_require = reqs('test.txt')
 
 # -*- Long Description -*-
 

tox.ini

@@ -15,7 +15,9 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/easy_install -U distribute
            {envbindir}/pip install                              \
                 --download-cache={toxworkdir}/_download         \
-                -r{toxinidir}/requirements/test-py3k.txt
+                -r{toxinidir}/requirements/test.txt             \
+                coverage>=3.0                                   \
+                SQLAlchemy
            {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py33]
@@ -27,13 +29,16 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/easy_install -U distribute
            {envbindir}/pip install                              \
                 --download-cache={toxworkdir}/_download         \
-                -r{toxinidir}/requirements/test-py3k.txt
+                -r{toxinidir}/requirements/test.txt             \
+                coverage>=3.0                                   \
+                SQLAlchemy
            {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py27]
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
+       -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
@@ -46,6 +51,7 @@ basepython = python2.6
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/py26.txt
        -r{toxinidir}/requirements/test.txt
+       -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
@@ -56,7 +62,9 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
 [testenv:pypy]
 basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/test-pypy.txt
+       -r{toxinidir}/requirements/test.txt
+       -r{toxinidir}/requirements/test-ci.txt
+       coverag>=3.0
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \