diff --git a/releasenotes/notes/drop-py-2-7-afe69612bfabaeee.yaml b/releasenotes/notes/drop-py-2-7-afe69612bfabaeee.yaml new file mode 100644 index 0000000..e9528c9 --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-afe69612bfabaeee.yaml @@ -0,0 +1,5 @@ +upgrade: + - | + Python 2.7 support has been dropped. Last release of virtualbmc + to support Python 2.7 is OpenStack Train. The minimum version of Python now + supported by virtualbmc is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 8eee154..a33ab1b 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/test-requirements.txt b/test-requirements.txt index 278de98..591ac54 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0 python-subunit>=1.0.0 # Apache-2.0/BSD -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 openstackdocstheme>=1.20.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 1970d68..beb03c9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] minversion = 2.0 skipsdist = True -envlist = py3,py27,pep8 +envlist = py3,pep8 [testenv] +basepython = python3 usedevelop = True setenv = VIRTUAL_ENV={envdir} PYTHONDONTWRITEBYTECODE = 1 @@ -21,17 +22,14 @@ commands = passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:pep8] -basepython = python3 commands = flake8 {posargs} doc8 README.rst CONTRIBUTING.rst HACKING.rst doc/source [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 setenv = {[testenv]setenv} PYTHON=coverage run --source virtualbmc --parallel-mode commands = @@ -41,22 +39,18 @@ commands = coverage xml -o cover/coverage.xml [testenv:docs] -basepython = python3 commands = python setup.py build_sphinx [testenv:pdf-docs] -basepython = python3 whitelist_externals = make commands = sphinx-build -b latex doc/source doc/build/pdf 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] @@ -66,7 +60,6 @@ max-complexity=17 [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 508dd7f..a0af942 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -2,7 +2,6 @@ templates: - release-notes-jobs-python3 - publish-openstack-docs-pti - - openstack-python-jobs - openstack-python3-ussuri-jobs - check-requirements check: