1 files changed, 44 insertions, 17 deletions
diff --git a/tox.ini b/tox.ini
index 57feb6d..a660749 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,37 +5,64 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-passenv = ZUUL_CACHE_DIR
-          REQUIREMENTS_PIP_LOCATION
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+passenv = UPPER_CONSTRAINTS_FILE
+install_command = pip install -U {opts} {packages}
 setenv =
-   VIRTUAL_ENV={envdir}
-   BRANCH_NAME=master
-   CLIENT_NAME=os-client-config
-   OS_STDOUT_CAPTURE=1
-   OS_STDERR_CAPTURE=1
-   OS_TEST_TIMEOUT=60
-deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+    VIRTUAL_ENV={envdir}
+    LANG=en_US.UTF-8
+    LANGUAGE=en_US:en
+    LC_ALL=C
+    OS_STDOUT_CAPTURE=1
+    OS_STDERR_CAPTURE=1
+    OS_TEST_TIMEOUT=60
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
+commands = stestr run {posargs}
+           stestr slowest
 
 [testenv:pep8]
-commands = flake8
+usedevelop = False
+skip_install = True
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    doc8
+    hacking
+    pygments
+    readme
+commands =
+    doc8 doc/source
+    python setup.py check -r -s
+    flake8 os_client_config
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --coverage-package-name=os_client_config --testr-args='{posargs}'
+setenv =
+    {[testenv]setenv}
+    PYTHON=coverage run --source os_client_config --parallel-mode
+commands =
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:docs]
+skip_install = True
 deps =
-    {[testenv]deps}
-    readme
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/doc/requirements.txt
 commands =
-    python setup.py build_sphinx
-    python setup.py check -r -s
+  sphinx-build -W -d doc/build/doctrees -b html doc/source/ doc/build/html
 
 [testenv:releasenotes]
+skip_install = True
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]