diff --git a/.zuul.yaml b/.zuul.yaml index 6002dcd69..26ac9a7c2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -10,14 +10,13 @@ - publish-openstack-docs-pti - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs - release-notes-jobs-python3 check: jobs: - - openstack-tox-functional - openstack-tox-functional-py36 - openstack-tox-functional-py37 + - openstack-tox-pep8 - placement-nova-tox-functional-py37 - placement-nested-perfload: voting: false @@ -46,9 +45,9 @@ irrelevant-files: *gate-irrelevant-files gate: jobs: - - openstack-tox-functional - openstack-tox-functional-py36 - openstack-tox-functional-py37 + - openstack-tox-pep8 - placement-nova-tox-functional-py37 - tempest-integrated-placement: irrelevant-files: *gate-irrelevant-files diff --git a/releasenotes/notes/drop-python-2-aabea7dcdeca7ebf.yaml b/releasenotes/notes/drop-python-2-aabea7dcdeca7ebf.yaml new file mode 100644 index 000000000..42abf96c1 --- /dev/null +++ b/releasenotes/notes/drop-python-2-aabea7dcdeca7ebf.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. The minimum version of Python now + supported by placement is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 4c5b94adf..f232dfe43 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,8 +19,6 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 diff --git a/tox.ini b/tox.ini index b755882f7..f1294eff6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.1.1 -envlist = py27,py37,functional,functional-py37,pep8 +envlist = py37,functional-py37,pep8 skipsdist = True # Automatic envs (pyXX) will use the python version appropriate to that # env and ignore basepython inherited from [testenv]. That's what we @@ -34,12 +34,8 @@ passenv = # there is also secret magic in subunit-trace which lets you run in a fail only # mode. To do this define the TRACE_FAILONLY environmental variable. -# The functional environment is both the base env for functional tests and -# also the python 2.7 version of functional tests. This is a historical -# artifact. +# The functional environment is the base env for functional tests. [testenv:functional] -basepython = python2.7 -envdir = {toxworkdir}/py27 commands = stestr --test-path=./placement/tests/functional run {posargs}