diff --git a/.zuul.yaml b/.zuul.yaml index 78759f5..4972707 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,7 +2,6 @@ templates: - check-requirements - openstack-lower-constraints-jobs - - openstack-python-jobs - openstack-python3-ussuri-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/releasenotes/notes/drop-py2-7-345ca486b838f0bb.yaml b/releasenotes/notes/drop-py2-7-345ca486b838f0bb.yaml new file mode 100644 index 0000000..70927b4 --- /dev/null +++ b/releasenotes/notes/drop-py2-7-345ca486b838f0bb.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of sahara and its plugins + to support python 2.7 is OpenStack Train. The minimum version of Python now + supported by sahara and its plugins is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 67857d9..d5b660f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,8 +5,6 @@ description-file = README.rst license = Apache Software License classifiers = 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 2864348..33194fc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,13 @@ [tox] -envlist = py27,py37,pep8 -minversion = 2.0 +envlist = py37,pep8 +minversioon = 3.1.1 skipsdist = 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 install_command = pip install {opts} {packages} setenv = @@ -16,10 +20,6 @@ deps = commands = stestr run {posargs} passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY -[testenv:debug-py27] -basepython = python2.7 -commands = oslo_debug_helper -t sahara_plugin_vanilla/tests/unit {posargs} - [testenv:debug-py36] basepython = python3.6 commands = oslo_debug_helper -t sahara_plugin_vanilla/tests/unit {posargs} @@ -29,7 +29,6 @@ basepython = python3.7 commands = oslo_debug_helper -t sahara_plugin_vanilla/tests/unit {posargs} [testenv:pep8] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt @@ -42,11 +41,9 @@ commands = bash -c "find sahara_plugin_vanilla -iname '*.sh' -print0 | xargs -0 bashate -v" [testenv:venv] -basepython = python3 commands = {posargs} [testenv:docs] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt @@ -57,7 +54,6 @@ whitelist_externals = rm [testenv:pdf-docs] -basepython = python3 deps = {[testenv:docs]deps} commands = rm -rf doc/build/pdf @@ -68,7 +64,6 @@ whitelist_externals = rm [testenv:releasenotes] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt @@ -78,7 +73,6 @@ commands = whitelist_externals = rm [testenv:debug] -basepython = python3 # It runs tests from the specified dir (default is sahara_plugin_vanilla/tests) # in interactive mode, so, you could use pbr for tests debug. # Example usage: tox -e debug -- -t sahara_plugin_vanilla/tests/unit some.test.path @@ -103,7 +97,6 @@ enable-extensions=H904,H106,H203,H204,H205 ignore=E123,E226,E402,E731,W503 [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt