diff options
author | Stephen Finucane <stephenfin@redhat.com> | 2023-02-17 11:38:10 +0000 |
---|---|---|
committer | Stephen Finucane <stephenfin@redhat.com> | 2023-02-17 11:38:42 +0000 |
commit | a90c449968927d16d8790704b0ec36fac1dcd4b4 (patch) | |
tree | c6ec556d1f509d6d3d8f67cf10d147d1519686c8 | |
parent | 03605c2db7d034ad6776b860d4928939ae7e3594 (diff) | |
download | oslo-i18n-a90c449968927d16d8790704b0ec36fac1dcd4b4.tar.gz |
tox: Remove 'ignore_base_python_conflict'
We don't need this in a world where Python 3 is the default Python
version in virtually all environments.
We also reshuffle the file to make the ordering a little more logical.
Change-Id: I1c207c4310b9617770e6097ce9a583789f7ce85b
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
-rw-r--r-- | tox.ini | 41 |
1 files changed, 18 insertions, 23 deletions
@@ -1,16 +1,23 @@ [tox] minversion = 3.18.0 envlist = py3,pep8 -ignore_basepython_conflict = true [testenv] -basepython = python3 deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = stestr run --slowest {posargs} +[testenv:cover] +setenv = + PYTHON=coverage run --source oslo_i18n --parallel-mode +commands = + stestr run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml + [testenv:pep8] deps = -r{toxinidir}/test-requirements.txt @@ -32,23 +39,21 @@ commands = rm -rf doc/build sphinx-build -W --keep-going -b html doc/source doc/build/html -[testenv:cover] -setenv = - PYTHON=coverage run --source oslo_i18n --parallel-mode +[testenv:releasenotes] +whitelist_externals = + rm +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt commands = - stestr run {posargs} - coverage combine - coverage html -d cover - coverage xml -o cover/coverage.xml - + rm -rf releasenotes/build + sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html [flake8] +show-source = True # E123, E125 skipped as they are invalid PEP-8. # E731 skipped as assign a lambda expression - -show-source = True ignore = E123,E125,E731,W504 - # H106: Don’t put vim configuration in source files # H203: Use assertIs(Not)None to check for None enable-extensions=H106,H203 @@ -57,13 +62,3 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py [hacking] import_exceptions = oslo_i18n._i18n._ - -[testenv:releasenotes] -whitelist_externals = - rm -deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} - -r{toxinidir}/doc/requirements.txt -commands = - rm -rf releasenotes/build - sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html |