diff --git a/.zuul.yaml b/.zuul.yaml index 7fcfb17..c15e58c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -26,7 +26,6 @@ - tempest-plugin-jobs check: jobs: - - zun-tempest-docker-sql - zun-tempest-py3-docker-sql - zun-tempest-py35-docker-sql-rocky - zun-tempest-py35-docker-sql-stein @@ -35,7 +34,6 @@ gate: queue: zun jobs: - - zun-tempest-docker-sql - zun-tempest-py3-docker-sql - zun-tempest-py35-docker-sql-rocky - zun-tempest-py35-docker-sql-stein diff --git a/releasenotes/notes/drop-py-2-7-45bf75864e345d16.yaml b/releasenotes/notes/drop-py-2-7-45bf75864e345d16.yaml new file mode 100644 index 0000000..7226d8d --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-45bf75864e345d16.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of zun-tempest-plugin + to support py2.7 is OpenStack Train. The minimum version of Python now + supported by zun-tempest-plugin is Python 3.5. diff --git a/setup.cfg b/setup.cfg index 8f0d58c..5bf8824 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.5 diff --git a/test-requirements.txt b/test-requirements.txt index 066dcc3..eb36641 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,8 +4,7 @@ hacking<0.13,>=0.12.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD openstackdocstheme>=1.20.0 # Apache-2.0 # releasenotes reno>=2.5.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index da740ef..88320ad 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -minversion = 2.0 -envlist = py35,py27,pep8 +minversion = 3.1.1 +envlist = py35,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True install_command = pip install {opts} {packages} setenv = @@ -15,30 +17,24 @@ deps = 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 = doc8 --ignore D000 -e .rst doc/source/ CONTRIBUTING.rst HACKING.rst README.rst 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]