contrib directory now named 'extra'

This commit is contained in:
Ask Solem 2012-06-21 15:23:37 +01:00
parent df458539b7
commit 5cedbd24a1
12 changed files with 24 additions and 13 deletions

View File

@ -9,7 +9,7 @@ include README
include THANKS include THANKS
include TODO include TODO
include setup.cfg include setup.cfg
recursive-include contrib * recursive-include extra *
recursive-include docs * recursive-include docs *
recursive-include kombu *.py recursive-include kombu *.py
recursive-include requirements *.txt recursive-include requirements *.txt

View File

@ -0,0 +1,11 @@
====================================================
Generic RabbitMQ manager - kombu.utils.amq_manager
====================================================
.. contents::
:local:
.. currentmodule:: kombu.utils.amq_manager
.. automodule:: kombu.utils.amq_manager
:members:
:undoc-members:

View File

@ -63,12 +63,12 @@ def upload_docs(options):
@task @task
def autodoc(options): def autodoc(options):
sh("contrib/release/doc4allmods kombu") sh("extra/release/doc4allmods kombu")
@task @task
def verifyindex(options): def verifyindex(options):
sh("contrib/release/verify-reference-index.sh") sh("extra/release/verify-reference-index.sh")
@task @task
@ -80,7 +80,7 @@ def clean_readme(options):
@task @task
@needs("clean_readme") @needs("clean_readme")
def readme(options): def readme(options):
sh("python contrib/release/sphinx-to-rst.py docs/templates/readme.txt \ sh("python extra/release/sphinx-to-rst.py docs/templates/readme.txt \
> README.rst") > README.rst")
sh("ln -sf README.rst README") sh("ln -sf README.rst README")
@ -92,7 +92,7 @@ def readme(options):
def bump(options): def bump(options):
s = "-- '%s'" % (options.custom, ) \ s = "-- '%s'" % (options.custom, ) \
if getattr(options, "custom", None) else "" if getattr(options, "custom", None) else ""
sh("contrib/release/bump_version.py \ sh("extra/release/bump_version.py \
kombu/__init__.py README.rst %s" % (s, )) kombu/__init__.py README.rst %s" % (s, ))
@ -135,7 +135,7 @@ def flake8(options):
]) ])
def flakeplus(options): def flakeplus(options):
noerror = getattr(options, "noerror", False) noerror = getattr(options, "noerror", False)
sh("python contrib/release/flakeplus.py kombu", sh("python extra/release/flakeplus.py kombu",
ignore_error=noerror) ignore_error=noerror)

14
tox.ini
View File

@ -12,7 +12,7 @@ recreate = True
basepython = python3.2 basepython = python3.2
changedir = .tox changedir = .tox
deps = -r{toxinidir}/requirements/default.txt deps = -r{toxinidir}/requirements/default.txt
commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir} commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
{envbindir}/easy_install -U distribute {envbindir}/easy_install -U distribute
{envbindir}/pip install \ {envbindir}/pip install \
--download-cache={toxworkdir}/_download \ --download-cache={toxworkdir}/_download \
@ -39,7 +39,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
basepython = python2.7 basepython = python2.7
deps = -r{toxinidir}/requirements/default.txt deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test.txt -r{toxinidir}/requirements/test.txt
commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir} commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
nosetests --with-xunit \ nosetests --with-xunit \
--xunit-file={toxinidir}/nosetests.xml \ --xunit-file={toxinidir}/nosetests.xml \
--with-coverage3 --cover3-xml \ --with-coverage3 --cover3-xml \
@ -50,7 +50,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
basepython = python2.6 basepython = python2.6
deps = -r{toxinidir}/requirements/default.txt deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test.txt -r{toxinidir}/requirements/test.txt
commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir} commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
nosetests --with-xunit \ nosetests --with-xunit \
--xunit-file={toxinidir}/nosetests.xml \ --xunit-file={toxinidir}/nosetests.xml \
--with-coverage3 --cover3-xml \ --with-coverage3 --cover3-xml \
@ -61,7 +61,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
basepython = python2.5 basepython = python2.5
deps = -r{toxinidir}/requirements/default.txt deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test.txt -r{toxinidir}/requirements/test.txt
commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir} commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
nosetests --with-xunit \ nosetests --with-xunit \
--xunit-file={toxinidir}/nosetests.xml \ --xunit-file={toxinidir}/nosetests.xml \
--with-coverage3 --cover3-xml \ --with-coverage3 --cover3-xml \
@ -72,7 +72,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
basepython = pypy basepython = pypy
deps = -r{toxinidir}/requirements/default.txt deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test-pypy.txt -r{toxinidir}/requirements/test-pypy.txt
commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir} commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
nosetests --with-xunit \ nosetests --with-xunit \
--xunit-file={toxinidir}/nosetests.xml \ --xunit-file={toxinidir}/nosetests.xml \
--with-coverage3 --cover3-xml \ --with-coverage3 --cover3-xml \
@ -85,5 +85,5 @@ recreate = True
where = .tox where = .tox
deps = -r{toxinidir}/requirements/default.txt deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test-jython.txt -r{toxinidir}/requirements/test-jython.txt
commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir} commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
{toxinidir}/contrib/release/jython-run-tests {toxinidir} {toxinidir}/extra/release/jython-run-tests {toxinidir}