From e2275f2ea4b1369d3934ed5e162d97821b588edd Mon Sep 17 00:00:00 2001 From: pengyuesheng Date: Fri, 27 Dec 2019 15:56:39 +0800 Subject: [PATCH] Drop python 2.7 support and testing Ussuri Communtiy-wide goal: https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html Change-Id: I32d5dc317b821dee4a625506f227a8f5bfaaecfc --- .zuul.yaml | 1 - setup.cfg | 2 -- tox.ini | 9 ++------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index e6fdb796..c4ba04b2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,7 +2,6 @@ templates: - check-requirements - release-notes-jobs-python3 - - openstack-python-jobs - openstack-python3-ussuri-jobs - publish-openstack-docs-pti - openstack-lower-constraints-jobs diff --git a/setup.cfg b/setup.cfg index e01cd157..8c7ad2df 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 881d994d..6aca9e9d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] minversion = 2.0 -envlist = py27,py37,pep8 +envlist = py37,pep8 skipsdist = True [testenv] +basepython = python3 usedevelop = True install_command = pip install {opts} {packages} # Install also sitemap scraping tool, not installed by default @@ -15,7 +16,6 @@ deps = scrapy>=1.0.0 commands = stestr run --slowest {posargs} [testenv:pep8] -basepython = python3 commands = flake8 # Run doc8 to check .rst and .txt files. @@ -27,7 +27,6 @@ commands = bashate bin/doc-tools-check-languages bin/doc-tools-build-rst [testenv:releasenotes] -basepython = python3 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html @@ -35,11 +34,9 @@ commands = # commands = functional test command goes here [testenv:venv] -basepython = python3 commands = {posargs} [testenv:docs] -basepython = python3 commands = sphinx-build -W --keep-going -b html -d doc/build/doctrees doc/source doc/build/html @@ -50,7 +47,6 @@ commands = # separately, outside of the requirements files, and develop mode disabled # explicitly to avoid unnecessarily installing the checked-out repo too (this # further relies on "tox.skipsdist = True" above). -basepython = python3 deps = bindep commands = bindep test usedevelop = False @@ -64,7 +60,6 @@ max-complexity=29 ignore = H101 [testenv:lower-constraints] -basepython = python3 # Install also sitemap scraping tool, not installed by default # therefore not in requirements file deps =