From ab0e341aa0b7699796b47f74a410be9f1e56daa6 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 26 Aug 2016 15:08:35 +0200
Subject: [PATCH] Update requirements

Remove all unneeded requirements, also remove some extra tox targets.
Make docs environment the default tox environment.

Add bindep.txt file so that only required packages get installed. Add
bindep environment for tox.ini.

Change-Id: I5792ebeea31b845ad732822ea1c8e8d9030d65c0
---
 bindep.txt            | 13 +++++++++++++
 test-requirements.txt |  8 --------
 tox.ini               | 20 ++++++++++----------
 3 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 bindep.txt

diff --git a/bindep.txt b/bindep.txt
new file mode 100644
index 0000000..13b9230
--- /dev/null
+++ b/bindep.txt
@@ -0,0 +1,13 @@
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see http://docs.openstack.org/infra/bindep/ for additional information.
+
+gettext
+libxml2-dev [platform:dpkg]
+libxml2-devel [platform:rpm]
+libxml2-utils [platform:dpkg]
+libxslt-devel [platform:rpm]
+libxslt1-dev [platform:dpkg]
+python-dev [platform:dpkg]
+python-lxml
+zlib-devel [platform:rpm]
+zlib1g-dev [platform:dpkg]
diff --git a/test-requirements.txt b/test-requirements.txt
index 21a7e3b..5a48bff 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,5 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking<0.11,>=0.10.0
-
-coverage>=3.6
-python-subunit>=0.0.18
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
diff --git a/tox.ini b/tox.ini
index f61cced..5037b92 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,29 +1,29 @@
 [tox]
 minversion = 2.0
-envlist = py34,py27,pypy,pep8
+envlist = docs
 skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command =
-                  pip install -U {opts} {packages}
+install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
-
-[testenv:pep8]
-commands = flake8 {posargs}
 
 [testenv:venv]
 commands = {posargs}
 
-[testenv:cover]
-commands = python setup.py test --coverage --testr-args='{posargs}'
-
 [testenv:docs]
 commands = python setup.py build_sphinx
 
+[testenv:bindep]
+# Do not install any requirements. We want this to be fast and work even if
+# system dependencies are missing, since it's used to tell you what system
+# dependencies are missing! This also means that bindep must be installed
+# separately, outside of the requirements files.
+deps = bindep
+commands = bindep test
+
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.