summaryrefslogtreecommitdiff
path: root/setup.cfg
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2014-11-17 14:33:10 +0000
committerAsk Solem <ask@celeryproject.org>2014-11-17 14:33:10 +0000
commitef32156cb94b8d9d1ca6ea5d30c7239d7285404f (patch)
treec57fb2de75b32b82b1d80b4d4542cd33b056e1db /setup.cfg
parent5bdacb1eccd4a99141b9294f802e02dcb1da988e (diff)
parent5e93fb88ac158027f7664bc110940a5d5dbe8193 (diff)
downloadlibrabbitmq-ef32156cb94b8d9d1ca6ea5d30c7239d7285404f.tar.gz
Merge branch '1.6'
Conflicts: Makefile setup.cfg
Diffstat (limited to 'setup.cfg')
-rw-r--r--setup.cfg19
1 files changed, 1 insertions, 18 deletions
diff --git a/setup.cfg b/setup.cfg
index 63dbc6d..815c182 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,22 +1,5 @@
[nosetests]
where = librabbitmq/tests
-cover3-branch = 1
-cover3-html = 1
-cover3-package = librabbitmq
-
-[build_sphinx]
-source-dir = docs/
-build-dir = docs/.build
-all_files = 1
-
-[upload_sphinx]
-upload-dir = docs/.build/html
[bdist_rpm]
-requires = amqp >= 1.2.0
-
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
+requires = amqp >= 1.4.6