Renames distribution contrib dir to 'extra'

Changelog

@@ -1847,7 +1847,7 @@ News
 * Redis result backend: Removed deprecated settings `REDIS_TIMEOUT` and
   `REDIS_CONNECT_RETRY`.
 
-* CentOS init script for :program:`celeryd` now available in `contrib/centos`.
+* CentOS init script for :program:`celeryd` now available in `extra/centos`.
 
 * Now depends on `pyparsing` version 1.5.0 or higher.
 
@@ -2634,7 +2634,7 @@ Experimental
 
 * Added generic init.d script using `celeryd-multi`
 
-    http://github.com/celery/celery/tree/master/contrib/generic-init.d/celeryd
+    http://github.com/celery/celery/tree/master/extra/generic-init.d/celeryd
 
 .. _v210-documentation:
 
@@ -3547,7 +3547,7 @@ News
 
     Before you run the tests you need to install the test requirements::
 
-        $ pip install -r contrib/requirements/test.txt
+        $ pip install -r requirements/test.txt
 
     Running all tests::
 
@@ -4205,7 +4205,7 @@ Fixes
   `nose` + `django-nose` for test discovery, and `unittest2` for test
   cases.
 
-* New pip requirements files available in `contrib/requirements`.
+* New pip requirements files available in :file:`requirements`.
 
 * TaskPublisher: Declarations are now done once (per process).
 
@@ -4239,22 +4239,22 @@ Backward incompatible changes
 
     We've had too many problems with celeryd daemonizing itself, so it was
     decided it has to be removed. Example startup scripts has been added to
-    `contrib/`:
+    the `extra/` directory:
 
     * Debian, Ubuntu, (start-stop-daemon)
 
-        `contrib/debian/init.d/celeryd`
-        `contrib/debian/init.d/celerybeat`
+        `extra/debian/init.d/celeryd`
+        `extra/debian/init.d/celerybeat`
 
     * Mac OS X launchd
 
-        `contrib/mac/org.celeryq.celeryd.plist`
-        `contrib/mac/org.celeryq.celerybeat.plist`
-        `contrib/mac/org.celeryq.celerymon.plist`
+        `extra/mac/org.celeryq.celeryd.plist`
+        `extra/mac/org.celeryq.celerybeat.plist`
+        `extra/mac/org.celeryq.celerymon.plist`
 
     * Supervisord (http://supervisord.org)
 
-        `contrib/supervisord/supervisord.conf`
+        `extra/supervisord/supervisord.conf`
 
     In addition to `--detach`, the following program arguments has been
     removed: `--uid`, `--gid`, `--workdir`, `--chroot`, `--pidfile`,

MANIFEST.in

@@ -1,22 +1,22 @@
 include CONTRIBUTORS.txt
 include Changelog
+include LICENSE
 include README.rst
 include MANIFEST.in
-include LICENSE
 include TODO
 include setup.cfg
+include setup.py
 recursive-include celery *.py
 recursive-include funtests *.py
 recursive-include docs *
-recursive-include contrib *
+recursive-include extra *
 recursive-include examples *
 recursive-include requirements *.txt
 prune tests/*.pyc
 prune docs/*.pyc
-prune contrib/*.pyc
+prune extra/*.pyc
 prune celery/*.pyc
 prune examples/*.pyc
 prune bin/*.pyc
 prune docs/.build
-prune docs/graffles
 prune .tox/*

docs/tutorials/daemonizing.rst

@@ -16,13 +16,13 @@ daemonization tools.
 Generic init scripts
 ====================
 
-See the `contrib/generic-init.d/`_ directory Celery distribution.
+See the `extra/generic-init.d/`_ directory Celery distribution.
 
 This directory contains generic bash init scripts for :program:`celeryd`,
 that should run on Linux, FreeBSD, OpenBSD, and other Unix platforms.
 
-.. _`contrib/generic-init.d/`:
-    http://github.com/celery/celery/tree/master/contrib/generic-init.d/
+.. _`extra/generic-init.d/`:
+    http://github.com/celery/celery/tree/master/extra/generic-init.d/
 
 .. _generic-initd-celeryd:
 
@@ -292,10 +292,10 @@ actual resulting output::
 `supervisord`_
 ==============
 
-* `contrib/supervisord/`_
+* `extra/supervisord/`_
 
-.. _`contrib/supervisord/`:
-    http://github.com/celery/celery/tree/master/contrib/supervisord/
+.. _`extra/supervisord/`:
+    http://github.com/celery/celery/tree/master/extra/supervisord/
 .. _`supervisord`: http://supervisord.org/
 
 .. _daemon-launchd:
@@ -303,10 +303,10 @@ actual resulting output::
 launchd (OS X)
 ==============
 
-* `contrib/mac/`_
+* `extra/mac/`_
 
-.. _`contrib/mac/`:
-    http://github.com/celery/celery/tree/master/contrib/mac/
+.. _`extra/mac/`:
+    http://github.com/celery/celery/tree/master/extra/mac/
 
 
 .. _daemon-windows:

contrib/supervisord/celerybeat.conf → extra/supervisord/celerybeat.conf

@@ -4,7 +4,7 @@
 
 ; NOTE: If you're using Django, you shouldn't use this file.
 ; Use
-; http://github.com/celery/django-celery/tree/master/contrib/supervisord/celerybeat.conf
+; http://github.com/celery/django-celery/tree/master/extra/supervisord/celerybeat.conf
 ; instead!
 
 [program:celerybeat]

contrib/supervisord/celeryd.conf → extra/supervisord/celeryd.conf

@@ -4,7 +4,7 @@
 
 ; NOTE: If you're using Django, you shouldn't use this file.
 ; Use
-; http://github.com/celery/django-celery/tree/master/contrib/supervisord/celeryd.conf
+; http://github.com/celery/django-celery/tree/master/extra/supervisord/celeryd.conf
 ; instead!
 
 [program:celery]

pavement.py

@@ -63,17 +63,17 @@ def upload_docs(options):
 
 @task
 def autodoc(options):
-    sh('contrib/release/doc4allmods celery')
+    sh('extra/release/doc4allmods celery')
 
 
 @task
 def verifyindex(options):
-    sh('contrib/release/verify-reference-index.sh')
+    sh('extra/release/verify-reference-index.sh')
 
 
 @task
 def verifyconfigref(options):
-    sh('PYTHONPATH=. %s contrib/release/verify_config_reference.py \
+    sh('PYTHONPATH=. %s extra/release/verify_config_reference.py \
             docs/configuration.rst' % (sys.executable, ))
 
 
@@ -118,13 +118,13 @@ def clean_readme(options):
 @task
 @needs('clean_readme')
 def readme(options):
-    sh('%s contrib/release/sphinx-to-rst.py docs/templates/readme.txt \
+    sh('%s extra/release/sphinx-to-rst.py docs/templates/readme.txt \
             > README.rst' % (sys.executable, ))
 
 
 @task
 def bump(options):
-    sh("contrib/release/bump_version.py \
+    sh("extra/release/bump_version.py \
             celery/__init__.py docs/includes/introduction.txt \
             --before-commit='paver readme'")
 
@@ -188,12 +188,12 @@ def release(options):
 
 @task
 def verify_authors(options):
-    sh('git shortlog -se | cut -f2 | contrib/release/attribution.py')
+    sh('git shortlog -se | cut -f2 | extra/release/attribution.py')
 
 
 @task
 def coreloc(options):
-    sh('xargs sloccount < contrib/release/core-modules.txt')
+    sh('xargs sloccount < extra/release/core-modules.txt')
 
 
 @task

requirements/README.rst

@@ -32,7 +32,7 @@ Running the tests using Python 2.5
 
 ::
 
-    $ pip -E $VIRTUAL_ENV install -U -r contrib/requirements/py25.txt
-    $ pip -E $VIRTUAL_ENV install -U -r contrib/requirements/default.txt
-    $ pip -E $VIRTUAL_ENV install -U -r contrib/requirements/test.txt
+    $ pip -E $VIRTUAL_ENV install -U -r requirements/py25.txt
+    $ pip -E $VIRTUAL_ENV install -U -r requirements/default.txt
+    $ pip -E $VIRTUAL_ENV install -U -r requirements/test.txt
 

tox.ini

@@ -11,33 +11,33 @@ recreate = True
 basepython = python3.2
 changedir = .tox
 deps = -r{toxinidir}/requirements/default-py3k.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+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
            pip install http://github.com/celery/kombu/zipball/master
-           {toxinidir}/contrib/release/py3k-run-tests {toxinidir}
+           {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py33]
 recreate = True
 basepython = python3.3
 changedir = .tox
 deps = -r{toxinidir}/requirements/default-py3k.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+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
 
            pip install http://github.com/celery/kombu/zipball/master
-           {toxinidir}/contrib/release/py3k-run-tests {toxinidir}
+           {toxinidir}/extra/release/py3k-run-tests {toxinidir}
 
 [testenv:py27]
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install http://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
@@ -50,7 +50,7 @@ basepython = python2.6
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/py26.txt
        -r{toxinidir}/requirements/test.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install http://github.com/celery/kombu/zipball/master
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
@@ -63,7 +63,7 @@ basepython = python2.5
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/py25.txt
        -r{toxinidir}/requirements/test.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \
@@ -74,7 +74,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test-pypy.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3 --cover3-xml              \