summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-01-30 13:12:22 +0000
committerGerrit Code Review <review@openstack.org>2020-01-30 13:12:22 +0000
commit8317c3e9d2ab948382a64abead25b079aff1f72e (patch)
treef64e476fec64b17f961613f558cf37279ba4d8a0
parent44c7c0c0e6265568d3f01a91f087d853064adfdd (diff)
parentd8c91bc7d0f12608e33212890bf4f07287b5df37 (diff)
downloadoslo-utils-8317c3e9d2ab948382a64abead25b079aff1f72e.tar.gz
Merge "tox: Trivial cleanup"
-rw-r--r--tox.ini12
1 files changed, 3 insertions, 9 deletions
diff --git a/tox.ini b/tox.ini
index 68f7b83..5546d66 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
[tox]
-minversion = 2.0
+minversion = 3.1
envlist = py27,py37,pep8
+ignore_basepython_conflict = True
[testenv]
-install_command = pip install {opts} {packages}
+basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
@@ -14,18 +15,15 @@ commands = stestr run --slowest {posargs}
basepython = python2.7
[testenv:pep8]
-basepython = python3
commands =
flake8
# Run security linter
bandit -r oslo_utils -x tests -n5
[testenv:venv]
-basepython = python3
commands = {posargs}
[testenv:docs]
-basepython = python3
whitelist_externals = rm
deps = -r{toxinidir}/doc/requirements.txt
commands =
@@ -33,11 +31,9 @@ commands =
sphinx-build -W --keep-going -b html doc/source doc/build/html
[testenv:cover]
-basepython = python3
commands = python setup.py test --coverage --coverage-package-name=oslo_utils --testr-args='{posargs}'
[testenv:bandit]
-basepython = python3
commands = bandit -r oslo_utils -x tests -n5
[flake8]
@@ -47,7 +43,6 @@ show-source = True
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py
[testenv:releasenotes]
-basepython = python3
whitelist_externals = rm
deps = -r{toxinidir}/doc/requirements.txt
commands =
@@ -55,7 +50,6 @@ 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