diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index c30a967..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,9 +0,0 @@ -oslo.config==5.2.0 -oslo.i18n==3.15.3 -enum34==1.0.4 -PrettyTable==0.7.1 -oslotest==3.5.0 -stestr==2.0.0 -oslo.serialization==2.21.1 -oslo.utils==4.5.0 -oslo.policy==2.0.0 diff --git a/tox.ini b/tox.ini index 5063b82..09df6d4 100644 --- a/tox.ini +++ b/tox.ini @@ -8,10 +8,9 @@ ignore_basepython_conflict = true basepython = python3 usedevelop = True setenv = - VIRTUAL_ENV={envdir} - OS_DEBUG=1 - OS_STDOUT_CAPTURE=1 - OS_STDERR_CAPTURE=1 + OS_DEBUG=1 + OS_STDOUT_CAPTURE=1 + OS_STDERR_CAPTURE=1 deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt @@ -26,14 +25,14 @@ commands = {posargs} [testenv:cover] deps = {[testenv]deps} - coverage + coverage setenv = - PYTHON=coverage run --source oslo_upgradecheck --parallel-mode + PYTHON=coverage run --source oslo_upgradecheck --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] whitelist_externals = @@ -45,15 +44,6 @@ commands = rm -rf doc/build sphinx-build -W --keep-going -b html doc/source doc/build/html -[testenv:debug] -commands = oslo_debug_helper {posargs} - -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt - [testenv:releasenotes] deps = {[testenv:docs]deps} whitelist_externals = @@ -62,9 +52,11 @@ commands = rm -rf releasenotes/build sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html +[testenv:debug] +commands = oslo_debug_helper {posargs} + [flake8] # E123, E125 skipped as they are invalid PEP-8. - show-source = True ignore = E123,E125,W504 builtins = _