diff --git a/.zuul.yaml b/.zuul.yaml index e42adf4..045f67f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,7 +1,6 @@ - project: templates: - check-requirements - - openstack-python-jobs - openstack-python3-ussuri-jobs check: jobs: @@ -11,9 +10,6 @@ - openstack-tox-pep8: required-projects: - openstack/nova - - openstack-tox-py27: - required-projects: - - openstack/nova - openstack-tox-py36: required-projects: - openstack/nova @@ -28,9 +24,6 @@ - openstack-tox-pep8: required-projects: - openstack/nova - - openstack-tox-py27: - required-projects: - - openstack/nova - openstack-tox-py36: required-projects: - openstack/nova diff --git a/releasenotes/notes/drop-python2-406d4474c1cf9cf9.yaml b/releasenotes/notes/drop-python2-406d4474c1cf9cf9.yaml new file mode 100644 index 0000000..9fd7dee --- /dev/null +++ b/releasenotes/notes/drop-python2-406d4474c1cf9cf9.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Python 2 is no longer supported. Python 3 is required. diff --git a/setup.cfg b/setup.cfg index 7df53af..10e2cf0 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/test-requirements.txt b/test-requirements.txt index b7996e6..023cff6 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 nose>=1.3.7 # LGPL mock>=2.0.0 # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD sphinxcontrib-httpdomain>=1.3.0 # BSD fixtures>=3.0.0 # Apache-2.0/BSD diff --git a/tox.ini b/tox.ini index 0066e38..3547cd1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -envlist = py27,py36,py37,pep8 -minversion = 2.0 +envlist = py36,py37,pep8 +minversion = 3.1.1 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} deps = -r{toxinidir}/test-requirements.txt @@ -16,15 +18,12 @@ commands = sitepackages = False [testenv:cover] -basepython = python3 commands = python setup.py testr --coverage --testr-args="{posargs}" [testenv:pep8] -basepython = python3 commands = flake8 {posargs} [testenv:venv] -basepython = python3 commands = {posargs} [flake8] @@ -33,7 +32,6 @@ builtins = _ exclude = .venv,.git,.tmp,.tox,dist,doc,*lib/python*,*egg,tools [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt