diff --git a/releasenotes/notes/drop-py2-76af844b0b952a91.yaml b/releasenotes/notes/drop-py2-76af844b0b952a91.yaml new file mode 100644 index 0000000..dab69be --- /dev/null +++ b/releasenotes/notes/drop-py2-76af844b0b952a91.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. The last release to support + py2.7 is OpenStack Train. The minimum version of Python now supported + is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 7d5eaf2..8092e87 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,10 +3,10 @@ name = os-refresh-config author = OpenStack author-email = openstack-discuss@lists.openstack.org summary = Refresh system configuration -description-file = +description-file = README.rst home-page = http://github.com/openstack/os-refresh-config -classifier = +classifier = Development Status :: 4 - Beta Environment :: Console Environment :: OpenStack @@ -15,14 +15,12 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: OS Independent 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 [files] -packages = +packages = os_refresh_config [entry_points] @@ -30,7 +28,7 @@ console_scripts = os-refresh-config = os_refresh_config.os_refresh_config:main [egg_info] -tag_build = +tag_build = tag_date = 0 tag_svn_revision = 0 diff --git a/tox.ini b/tox.ini index 100b68a..8ee032c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,14 @@ [tox] -minversion = 2.0 +minversion = 3.1.0 skipsdist = True -envlist = py27,py37,pep8 +envlist = py37,pep8 +skip_missing_interpreters = true +# this allows tox to infer the base python from the environment name +# and override any basepython configured in this file +ignore_basepython_conflict=true [testenv] +basepython = python3 usedevelop = True deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} @@ -17,11 +22,9 @@ commands = sitepackages = True [testenv:pep8] -basepython = python3 commands = flake8 [testenv:cover] -basepython = python3 setenv = PYTHON=coverage run --source os_refresh_config --parallel-mode commands = @@ -31,7 +34,6 @@ commands = coverage xml -o cover/coverage.xml [testenv:venv] -basepython = python3 commands = {posargs} [flake8] diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 0d4ff65..52b5ae0 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -2,6 +2,5 @@ templates: - check-requirements - openstack-cover-jobs - - openstack-python-jobs - openstack-python3-ussuri-jobs - tripleo-multinode-container-minimal