diff --git a/.zuul.yaml b/.zuul.yaml index 151059e..6df67a8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,8 +1,7 @@ - project: templates: - - openstack-python-jobs - openstack-python35-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs - check-requirements gate: queue: os-win diff --git a/releasenotes/notes/drop-py-2-7-9c98090411bcd207.yaml b/releasenotes/notes/drop-py-2-7-9c98090411bcd207.yaml new file mode 100644 index 0000000..9297318 --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-9c98090411bcd207.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of oswin-tempest-plugin + to support py2.7 is OpenStack Train. The minimum version of Python now + supported by oswin-tempest-plugin is Python 3.5. diff --git a/setup.cfg b/setup.cfg index 4b92b58..555cce2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,8 +14,6 @@ classifier = Operating System :: POSIX :: Linux Operating System :: Microsoft :: Windows Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 diff --git a/tox.ini b/tox.ini index c74e6a6..1b854ca 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -minversion = 2.0 -envlist = py27,py37,pypy,pep8 +minversion = 3.1.1 +envlist = py37,pypy,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages} setenv = @@ -17,23 +19,18 @@ deps = -r{toxinidir}/requirements.txt commands = python setup.py test --slowest --testr-args='{posargs}' [testenv:pep8] -basepython = python3 commands = flake8 {posargs} [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 commands = python setup.py test --coverage --testr-args='{posargs}' [testenv:docs] -basepython = python3 commands = python setup.py build_sphinx [testenv:debug] -basepython = python3 commands = oslo_debug_helper {posargs} [flake8]