From 894db185631015c6194cf696e9e868c4062dc70b Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Mon, 14 Sep 2015 15:47:14 +0200 Subject: [PATCH] Remove useless additional requirement file amqp1 requirements doesn't need anymore to be in a separate file. Change-Id: If8de5bcac231052ebf93323bf3923ab942a0de17 --- amqp1-requirements.txt | 3 --- test-requirements.txt | 4 ++++ tox.ini | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 amqp1-requirements.txt diff --git a/amqp1-requirements.txt b/amqp1-requirements.txt deleted file mode 100644 index 971b32910..000000000 --- a/amqp1-requirements.txt +++ /dev/null @@ -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 diff --git a/test-requirements.txt b/test-requirements.txt index ca11358c3..6a0e71bb1 100644 --- 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 diff --git a/tox.ini b/tox.ini index 7cf9b2bc5..c576bed72 100644 --- 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]