Permalink
Browse files

contrib directory now named 'extra'

  • Loading branch information...
1 parent df45853 commit 5cedbd24a12284123ae90ef148e13284ed91d47e @ask ask committed Jun 21, 2012
View
@@ -9,7 +9,7 @@ include README
include THANKS
include TODO
include setup.cfg
-recursive-include contrib *
+recursive-include extra *
recursive-include docs *
recursive-include kombu *.py
recursive-include requirements *.txt
@@ -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:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -63,12 +63,12 @@ def upload_docs(options):
@task
def autodoc(options):
- sh("contrib/release/doc4allmods kombu")
+ sh("extra/release/doc4allmods kombu")
@task
def verifyindex(options):
- sh("contrib/release/verify-reference-index.sh")
+ sh("extra/release/verify-reference-index.sh")
@task
@@ -80,7 +80,7 @@ def clean_readme(options):
@task
@needs("clean_readme")
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")
sh("ln -sf README.rst README")
@@ -92,7 +92,7 @@ def readme(options):
def bump(options):
s = "-- '%s'" % (options.custom, ) \
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, ))
@@ -135,7 +135,7 @@ def flake8(options):
])
def flakeplus(options):
noerror = getattr(options, "noerror", False)
- sh("python contrib/release/flakeplus.py kombu",
+ sh("python extra/release/flakeplus.py kombu",
ignore_error=noerror)
View
14 tox.ini
@@ -12,7 +12,7 @@ recreate = True
basepython = python3.2
changedir = .tox
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}/pip install \
--download-cache={toxworkdir}/_download \
@@ -39,7 +39,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
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}
nosetests --with-xunit \
--xunit-file={toxinidir}/nosetests.xml \
--with-coverage3 --cover3-xml \
@@ -50,7 +50,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
basepython = python2.6
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}
nosetests --with-xunit \
--xunit-file={toxinidir}/nosetests.xml \
--with-coverage3 --cover3-xml \
@@ -61,7 +61,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
basepython = python2.5
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}
nosetests --with-xunit \
--xunit-file={toxinidir}/nosetests.xml \
--with-coverage3 --cover3-xml \
@@ -72,7 +72,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 \
@@ -85,5 +85,5 @@ recreate = True
where = .tox
deps = -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test-jython.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
- {toxinidir}/contrib/release/jython-run-tests {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
+ {toxinidir}/extra/release/jython-run-tests {toxinidir}

0 comments on commit 5cedbd2

Please sign in to comment.