Switch to hacking 2.x

This supports Python 3 goodness. Some additional tox tweaks are included
while we're here.

Change-Id: Idba284defad550f7f90cccb4b288c00b77bc25de
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

test-requirements.txt

@@ -2,10 +2,8 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=0.12.0,<0.13 # Apache-2.0
-
+hacking>=2.0.0,<2.1.0 # Apache-2.0
 coverage>=4.0,!=4.4 # Apache-2.0
-python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 testtools>=1.4.0 # MIT

tox.ini

@@ -1,22 +1,15 @@
 [tox]
-minversion = 2.0
+minversion = 3.2
 envlist = py37,pep8
-skipsdist = True
-# Automatic envs (pyXX) will use the python version appropriate to that
-# env and ignore basepython inherited from [testenv]. That's what we
-# want, and we don't need to be warned about it.
 ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3
 usedevelop = True
-install_command = pip install {opts} {packages}
 setenv =
-   VIRTUAL_ENV={envdir}
-   PYTHONWARNINGS=default::DeprecationWarning
-   OS_STDOUT_CAPTURE=1
-   OS_STDERR_CAPTURE=1
-   OS_TEST_TIMEOUT=60
+  OS_STDOUT_CAPTURE=1
+  OS_STDERR_CAPTURE=1
+  OS_TEST_TIMEOUT=60
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
@@ -30,13 +23,12 @@ commands = {posargs}
 
 [testenv:cover]
 setenv =
-    VIRTUAL_ENV={envdir}
-    PYTHON=coverage run --source os_resource_classes --parallel-mode
+  PYTHON=coverage run --source os_resource_classes --parallel-mode
 commands =
-    stestr run {posargs}
-    coverage combine
-    coverage html -d cover
-    coverage xml -o cover/coverage.xml
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 deps =
@@ -63,7 +55,6 @@ commands = oslo_debug_helper {posargs}
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
-
 show-source = True
 ignore = E123,E125
 builtins = _