From fc401959ecedf2b740c3e3156649655c12f2c239 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 3 Feb 2020 20:25:55 +0100
Subject: [ussuri][goal] Drop python 2.7 support and testing

OpenStack is dropping the py2.7 support in ussuri cycle.

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://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html

Remove cruft from setup.cfg.
Update hacking so that it works with python3 and silence new warnings.

Change-Id: Id224fc09ac36d2a84e82347530bb5e5d30665803
---
 tox.ini | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index f7e1aeb..5bf2c17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,10 @@
 [tox]
-minversion = 2.0
-envlist = cover,docs,pep8,py27,py37,pylint,update-states
+minversion = 3.1.0
+envlist = cover,docs,pep8,py37,pylint,update-states
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 setenv =
 # We need to install a bit more than just `test' because those drivers have
 # custom tests that we always run
@@ -14,7 +16,6 @@ commands =
   stestr run {posargs}
 
 [testenv:docs]
-basepython = python3
 deps =
   {[testenv]deps}
   -r{toxinidir}/doc/requirements.txt
@@ -23,26 +24,22 @@ commands =
   doc8 doc/source
 
 [testenv:update-states]
-basepython = python3
 deps =
   {[testenv]deps}
   pydot3
 commands = {toxinidir}/tools/update_states.sh
 
 [testenv:pep8]
-basepython = python3
 commands =
   flake8 {posargs}
 
 [testenv:pylint]
-basepython = python3
 deps =
   {[testenv]deps}
   pylint==0.26.0
 commands = pylint --rcfile=pylintrc taskflow
 
 [testenv:cover]
-basepython = python3
 deps =
   {[testenv]deps}
   coverage>=3.6
@@ -56,13 +53,12 @@ commands =
    coverage xml -o cover/coverage.xml
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [flake8]
 builtins = _
 exclude = .venv,.tox,dist,doc,*egg,.git,build,tools
-ignore = E721
+ignore = E305,E402,E721,E731,E741,W503,W504
 
 [hacking]
 import_exceptions =
@@ -78,12 +74,10 @@ import_exceptions =
 ignore-path = doc/*/target,doc/*/build*
 
 [testenv:releasenotes]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:bindep]
-basepython = python3
 # Do not install any requirements. We want this to be fast and work even if
 # system dependencies are missing, since it's used to tell you what system
 # dependencies are missing! This also means that bindep must be installed
@@ -95,8 +89,6 @@ commands = bindep test
 usedevelop = False
 
 [testenv:lower-constraints]
-basepython = python3
-install_command = pip install {opts} {packages}
 deps =
   -c{toxinidir}/lower-constraints.txt
   .[test,workers,zookeeper,database,redis,eventlet]
-- 
cgit v1.2.1