diff --git a/doc/requirements.txt b/doc/requirements.txt index 71d9dcd..91846e7 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,5 +3,4 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.18.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD diff --git a/releasenotes/notes/drop-py-2-7-eb1979587d237f5e.yaml b/releasenotes/notes/drop-py-2-7-eb1979587d237f5e.yaml new file mode 100644 index 0000000..dc79638 --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-eb1979587d237f5e.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of watcher-tempest-plugin + to support py2.7 is OpenStack Train. The minimum version of Python now + supported by watcher-tempest-plugin is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 6ea13e6..69a84bf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,8 +13,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 7c91e26..7cf561b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -minversion = 2.0 -envlist = py37,py36,py27,pypy,pep8 +minversion = 3.1.1 +envlist = py37,py36,pypy,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True install_command = pip install {opts} {packages} setenv = @@ -15,22 +17,18 @@ deps = commands = python setup.py test --slowest --testr-args='{posargs}' [testenv:pep8] -basepython = python3 commands = doc8 doc/source/ CONTRIBUTING.rst HACKING.rst README.rst flake8 bandit -r watcher_tempest_plugin -x tests -n5 -ll -s B320 [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 commands = python setup.py test --coverage --testr-args='{posargs}' [testenv:docs] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt @@ -38,7 +36,6 @@ deps = commands = python setup.py build_sphinx [testenv:pdf-docs] -basepython = python3 envdir = {toxworkdir}/docs deps = {[testenv:docs]deps} whitelist_externals = @@ -50,12 +47,10 @@ commands = make -C doc/build/pdf [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] @@ -69,7 +64,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,demo/,releasenotes extension=.rst [testenv:bandit] -basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands = bandit -r watcher_tempest_plugin -x tests -n5 -ll -s B320