summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHervé Beraud <hberaud@redhat.com>2020-02-11 15:23:09 +0100
committerHervé Beraud <hberaud@redhat.com>2020-02-11 15:25:49 +0100
commit4af4e0271da3e2bd8e24fce05c675d742c6051b7 (patch)
tree6b653ee1bd8d8957f316980c209a7d1d434d9d4d
parent3e16288547142b68b423afbc93e2de4e7b9230b3 (diff)
downloadoslo-concurrency-4af4e0271da3e2bd8e24fce05c675d742c6051b7.tar.gz
trivial: Cleanup tox.ini
Update the minversion parameter to use the python -m pip to install python packages: https://tox.readthedocs.io/en/latest/changelog.html#id185 Also Inherit the jobs requirements to simplify maintainance. Change-Id: Icb5116908148dcbb58a7531bbed498d29ca1d2ea
-rw-r--r--tox.ini10
1 files changed, 4 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index d0f4193..216edd0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-minversion = 3.1
+minversion = 3.2.0
envlist = py37,pep8
ignore_basepython_conflict = True
@@ -8,7 +8,6 @@ basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
- -r{toxinidir}/requirements.txt
# We want to support both vanilla stdlib and eventlet monkey patched
whitelist_externals = env
commands =
@@ -16,8 +15,7 @@ commands =
env TEST_EVENTLET=1 lockutils-wrapper stestr run --slowest {posargs}
[testenv:pep8]
-deps =
- -r{toxinidir}/test-requirements.txt
+deps = {[testenv]deps}
commands =
flake8
# Run security linter
@@ -29,7 +27,7 @@ commands = {posargs}
[testenv:docs]
whitelist_externals = rm
deps =
- {[testenv]deps}
+ -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/doc/requirements.txt
commands =
rm -fr doc/build
@@ -54,7 +52,7 @@ import_exceptions =
oslo_concurrency._i18n
[testenv:releasenotes]
-deps = -r{toxinidir}/doc/requirements.txt
+deps = {[testenv:docs]deps}
commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html