Merge "Remove useless additional requirement file"

2015-09-15 13:42:35 +00:00 · 2015-09-15 13:42:35 +00:00 · c5b7ab6f1c
parent 4dbcfa6c96 894db18563
commit c5b7ab6f1c
3 changed files with 4 additions and 4 deletions
--- a/amqp1-requirements.txt
+++ b/amqp1-requirements.txt
@ -1,3 +0,0 @@
-# AMQP 1.0 support depends on the Qpid Proton AMQP 1.0
-# development libraries.
-pyngus>=1.3.1;python_version=='2.7'  # Apache-2.0
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -32,3 +32,7 @@ coverage>=3.6
 # this is required for the docs build jobs
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 oslosphinx>=2.5.0 # Apache-2.0
+
+# AMQP 1.0 support depends on the Qpid Proton AMQP 1.0
+# development libraries.
+pyngus>=1.3.1;python_version=='2.7'  # Apache 2.0 License
--- a/tox.ini
+++ b/tox.ini
@ -7,7 +7,6 @@ setenv =
    OS_TEST_TIMEOUT=30
 deps = -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
-       -r{toxinidir}/amqp1-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'

 [testenv:pep8]