Drop support for Python 2.7

Change-Id: I0a14324269cbfe8ae93aa4707e135e18a858d2aa
This commit is contained in:
Federico Ressi 2020-01-03 14:22:29 +01:00
parent 5ff9a34642
commit 0225e380d7
3 changed files with 16 additions and 5 deletions

View File

@ -2,7 +2,7 @@
source $(dirname "$0")/activate
PYTHON_VERSION=${PYTHON_VERSION:-}
PYTHON_VERSION=${PYTHON_VERSION:-3}
function python() {

17
tox.ini
View File

@ -17,7 +17,7 @@ setenv =
OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}
OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
PYTHON=python
PYTHON={env:PYTHON:python3}
PYTHONWARNINGS=ignore::Warning,{env:PYTHONWARNINGS:}
TOBIKO_PREVENT_CREATE={env:TOBIKO_PREVENT_CREATE:false}
VIRTUAL_ENV={envdir}
@ -40,6 +40,7 @@ commands = {[base]commands}
[testenv:cover]
basepython = python3
setenv =
{[testenv]setenv}
PYTHON=coverage run --parallel-mode
@ -60,6 +61,8 @@ whitelist_externals =
[testenv:pep8]
basepython = {env:PYTHON:python3}
deps =
{[testenv]deps}
-r{toxinidir}/linters-requirements.txt
@ -68,6 +71,8 @@ commands =
[testenv:linters]
basepython = {[testenv:pep8]basepython}
whitelist_externals = bash
deps = {[testenv:pep8]deps}
envdir = {toxworkdir}/pep8
@ -98,6 +103,7 @@ import-order-style = pep8
[openstack]
basepython = {env:PYTHON:python3}
deps = {[base]deps}
passenv =
{[base]passenv}
@ -109,6 +115,7 @@ commands = {[base]commands}
[testenv:functional]
basepython = {[openstack]basepython}
deps = {[openstack]deps}
passenv = {[openstack]passenv}
setenv =
@ -118,6 +125,7 @@ setenv =
[testenv:scenario]
basepython = {[openstack]basepython}
deps = {[openstack]deps}
passenv = {[openstack]passenv}
setenv =
@ -127,6 +135,7 @@ setenv =
[testenv:neutron]
basepython = {[openstack]basepython}
envdir = {toxworkdir}/scenario
deps = {[testenv:scenario]deps}
passenv = {[testenv:scenario]passenv}
@ -137,6 +146,7 @@ setenv =
[testenv:faults]
basepython = {[openstack]basepython}
envdir = {toxworkdir}/scenario
deps = {[testenv:scenario]deps}
passenv = {[testenv:scenario]passenv}
@ -150,6 +160,7 @@ commands =
[testenv:venv]
basepython = {[openstack]basepython}
envdir = {toxworkdir}/scenario
deps = {[testenv:scenario]deps}
passenv = {[testenv:scenario]passenv}
@ -162,7 +173,7 @@ commands = {posargs}
[docs]
basepython = python3
basepython = {env:PYTHON:python3}
envdir = {toxworkdir}/docs
deps =
{[base]deps}
@ -198,6 +209,8 @@ commands =
# --- CI report environments --------------------------------------------------
[testenv:report]
basepython = {env:PYTHON:python3}
skipsdist=True
usedevelop = False
deps = -r {toxinidir}/report-requirements.txt

View File

@ -4,11 +4,9 @@
- build-openstack-docs-pti
- docs-on-readthedocs
- openstack-cover-jobs
- openstack-python-jobs
- openstack-python35-jobs
- openstack-python36-jobs
- openstack-python37-jobs
- openstack-python-jobs
- publish-to-pypi
- build-release-notes-jobs-python3
vars: