summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-01-20 19:15:05 +0000
committerGerrit Code Review <review@openstack.org>2020-01-20 19:15:05 +0000
commit0e9364fe3ee8163e2e4cc0232024b8c867466bd8 (patch)
tree1a68d1d7b54dba1be209c106cf4a21d4683e183e
parent27f8a5d01c40a4f0693fc2abfc1aaa38bad23e4d (diff)
parentfc2106146013bb0881aaf5ce8f8eca45a48ef167 (diff)
downloadoslo-concurrency-0e9364fe3ee8163e2e4cc0232024b8c867466bd8.tar.gz
Merge "tox: Trivial cleanup"
-rw-r--r--tox.ini13
1 files changed, 3 insertions, 10 deletions
diff --git a/tox.ini b/tox.ini
index 29547e6..3e1d776 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,10 @@
[tox]
-minversion = 2.0
+minversion = 3.1
envlist = py27,py37,pep8
+ignore_basepython_conflict = True
[testenv]
+basepython = python3
install_command = pip install {opts} {packages}
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@@ -14,11 +16,7 @@ commands =
lockutils-wrapper stestr run --slowest {posargs}
env TEST_EVENTLET=1 lockutils-wrapper stestr run --slowest {posargs}
-[testenv:py27]
-basepython = python2.7
-
[testenv:pep8]
-basepython = python3
deps =
-r{toxinidir}/test-requirements.txt
commands =
@@ -27,11 +25,9 @@ commands =
bandit -r oslo_concurrency -x tests -n5 --skip B311,B404,B603,B606
[testenv:venv]
-basepython = python3
commands = {posargs}
[testenv:docs]
-basepython = python3
whitelist_externals = rm
deps =
{[testenv]deps}
@@ -41,7 +37,6 @@ commands =
sphinx-build -W --keep-going -b html doc/source doc/build/html {posargs}
[testenv:cover]
-basepython = python3
setenv =
PYTHON=coverage run --source oslo_concurrency --parallel-mode
commands =
@@ -60,13 +55,11 @@ import_exceptions =
oslo_concurrency._i18n
[testenv:releasenotes]
-basepython = python3
deps = -r{toxinidir}/doc/requirements.txt
commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
[testenv:lower-constraints]
-basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt