From 702da9c50d24beadbc2fdcbddd0b77a03146ba5e Mon Sep 17 00:00:00 2001 From: Christopher Dearborn Date: Fri, 24 Apr 2020 15:13:03 -0400 Subject: [PATCH] Drop python 2.7 support and testing OpenStack is dropping support for py2.7 in the ussuri cycle. python-dracclient supports python 3 and is ready to drop python 2.7 support. Complete discussion & schedule can be found in - http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html - https://etherpad.openstack.org/p/drop-python2-support Ussuri Communtiy-wide goal - https://review.opendev.org/691178 Change-Id: I7171e749707430c2c21c81976174e1278679c9c1 --- doc/requirements.txt | 1 - setup.cfg | 2 -- tox.ini | 4 ++-- zuul.d/project.yaml | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 073d2a4..c481145 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,6 +2,5 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD openstackdocstheme # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 088478d..3fb05e3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,8 +12,6 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX 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 dd31147..b66af5d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37,py36,py27,pep8 +envlist = py37,py36,pep8 [testenv] usedevelop = True @@ -7,6 +7,7 @@ install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.o deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +basepython = python3 setenv = PYTHONDONTWRITEBYTECODE=1 commands = coverage run --branch --source dracclient --omit "dracclient/tests*" -m unittest discover dracclient.tests @@ -16,7 +17,6 @@ commands = commands = {posargs} [testenv:pep8] -basepython = python2.7 commands = flake8 dracclient doc8 README.rst CONTRIBUTING.rst doc/source diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 5121e66..fd189e2 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -1,4 +1,3 @@ - project: templates: - - openstack-python-jobs - openstack-python3-ussuri-jobs