From 31c85d484f45711b6c00f8d9012deae257f77940 Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Wed, 30 Nov 2016 14:35:45 +0100
Subject: [PATCH] Move tox dependencies to
 requirements.txt/test-requirements.txt

Previously we had our requirements in two different places:
requirements/test-requirements for normal installation, and
tools/pip-requires & tools/test-requires for tox tests. Let's
unify them on a single location.

Change-Id: I3e31eeb70e7db24d87b8a7c67a427c53af814a32
---
 test-requirements.txt | 5 ++++-
 tools/pip-requires    | 1 -
 tools/test-requires   | 7 -------
 tox.ini               | 4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 tools/pip-requires
 delete mode 100644 tools/test-requires

diff --git a/test-requirements.txt b/test-requirements.txt
index 9564d0e7e..44338878d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,6 @@
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 oslosphinx>=2.5.0 # Apache-2.0
-reno>=0.1.1 # Apache2
\ No newline at end of file
+reno>=0.1.1 # Apache2
+os-testr>=0.4.1 # Apache-2.0
+coverage
+hacking>=0.9.5,<0.10
diff --git a/tools/pip-requires b/tools/pip-requires
deleted file mode 100644
index 09d5c2c89..000000000
--- a/tools/pip-requires
+++ /dev/null
@@ -1 +0,0 @@
-docutils>=0.11
diff --git a/tools/test-requires b/tools/test-requires
deleted file mode 100644
index 9f7e17210..000000000
--- a/tools/test-requires
+++ /dev/null
@@ -1,7 +0,0 @@
-os-testr>=0.4.1 # Apache-2.0
-coverage
-hacking>=0.9.5,<0.10
-netaddr
-pyOpenSSL
-# releasenotes
-reno>=1.8.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index e71b4eea1..757c44743 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,8 @@ setenv = VIRTUAL_ENV={envdir}
          LANGUAGE=en_US:en
          LC_ALL=C
 
-deps = -r{toxinidir}/tools/pip-requires
-       -r{toxinidir}/tools/test-requires
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = /usr/bin/find . -type f -name "*.pyc" -delete
            ostestr {posargs}