diff --git a/.zuul.yaml b/.zuul.yaml index 7d7acc9..fd189e2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,3 @@ - project: templates: - - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs diff --git a/releasenotes/notes/drop-py-2-7-0b6b170cacac80e0.yaml b/releasenotes/notes/drop-py-2-7-0b6b170cacac80e0.yaml new file mode 100644 index 0000000..34738aa --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-0b6b170cacac80e0.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of devstack-tools + to support py2.7 is OpenStack Train. The minimum version of Python now + supported by devstack-tools is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 5440aeb..40f8cbc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://opendev.org/openstack/devstack-tools/src/branch/master/README.rst +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology diff --git a/tox.ini b/tox.ini index 1edcf7e..9d9a15f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -minversion = 2.0 +minversion = 3.1.1 envlist = py36,py37,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} setenv = @@ -13,28 +15,22 @@ deps = -r{toxinidir}/test-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:releasenotes] -basepython = python3 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:debug] -basepython = python3 commands = oslo_debug_helper {posargs} [flake8]