diff options
author | Andreas Jaeger <aj@suse.com> | 2020-02-06 18:52:50 +0100 |
---|---|---|
committer | Andreas Jaeger <aj@suse.com> | 2020-02-06 18:58:12 +0100 |
commit | 97db90165829098b6fcf9758913da0175a9f894f (patch) | |
tree | 7f2ec49fd09389ca4fc868f6fbcd03a755ac69dd /tox.ini | |
parent | b833f8ec2a16a6ce749485b2607f06fb4e8abd17 (diff) | |
download | heat-97db90165829098b6fcf9758913da0175a9f894f.tar.gz |
[ussuri][goal] Finish dropping python 2.7 support
OpenStack is dropping the py2.7 support in ussuri cycle.
Complete discussion & schedule can be found in
- http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html
- https://etherpad.openstack.org/p/drop-python2-support
Ussuri Communtiy-wide goal:
https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html
This change cleans up:
* remove old requirements
* remove universal wheel building, we don't need this for py3
* cleanup setup.py
* tox.ini: move basepython around; remove install_command since the
default is fine and constraints should be in deps; add
ignore_basepython_conflict
Change-Id: Ife0a696ca62be21d3d93c5d8279a412578f62697
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 25 |
1 files changed, 8 insertions, 17 deletions
@@ -1,15 +1,17 @@ [tox] envlist = py36,py37,pep8 -minversion = 1.6 +ignore_basepython_conflict = True +minversion = 3.1.0 skipsdist = True [testenv] +basepython = python3 setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning OS_TEST_PATH=heat/tests usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} -deps = -r{toxinidir}/requirements.txt +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} @@ -18,7 +20,6 @@ commands = passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:pep8] -basepython = python3 commands = flake8 heat bin/heat-api bin/heat-api-cfn bin/heat-engine bin/heat-manage contrib heat_integrationtests doc/source python tools/custom_guidelines.py --exclude heat/engine/resources/aws @@ -39,11 +40,9 @@ commands = doc8 {posargs} [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 setenv = PYTHON=coverage run --source heat --parallel-mode commands = @@ -55,7 +54,6 @@ commands = coverage report [testenv:docs] -basepython = python3 whitelist_externals = rm deps = -r{toxinidir}/doc/requirements.txt @@ -64,7 +62,6 @@ commands = sphinx-build -W --keep-going -b html doc/source doc/build/html [testenv:pdf-docs] -basepython = python3 deps = {[testenv:docs]deps} whitelist_externals = make @@ -73,7 +70,6 @@ commands = make -C doc/build/pdf [testenv:api-ref] -basepython = python3 # This environment is called from CI scripts to test and publish # the API Ref to docs.openstack.org. deps = -r{toxinidir}/doc/requirements.txt @@ -83,19 +79,18 @@ commands = sphinx-build -W --keep-going -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html [testenv:genconfig] -basepython = python3 commands = oslo-config-generator --config-file=config-generator.conf oslo-config-generator --config-file=heat_integrationtests/config-generator.conf [testenv:genpolicy] -basepython = python3 commands = oslopolicy-sample-generator --config-file etc/heat/heat-policy-generator.conf [testenv:bandit] -basepython = python3 -deps = -r{toxinidir}/test-requirements.txt +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/test-requirements.txt # The following bandit tests are being skipped: # B101: Test for use of assert # B104: Test for binding to all interfaces @@ -125,11 +120,9 @@ import_exceptions = heat.common.i18n local-check-factory = heat.hacking.checks.factory [testenv:debug] -basepython = python3 commands = oslo_debug_helper {posargs} [testenv:releasenotes] -basepython = python3 whitelist_externals = rm deps = -r{toxinidir}/doc/requirements.txt @@ -138,7 +131,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html [testenv:bindep] -basepython = python3 # Do not install any requirements. We want this to be fast and work even if # system dependencies are missing, since it's used to tell you what system # dependencies are missing! This also means that bindep must be installed @@ -150,7 +142,6 @@ commands = bindep test usedevelop = False [testenv:lower-constraints] -basepython = python3 install_command = pip install {opts} {packages} deps = -c{toxinidir}/lower-constraints.txt |