From 0db295913dc573e00d3bb85ce68ce3d62c53e4f1 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sat, 29 Feb 2020 20:39:04 -0600
Subject: [PATCH] [ussuri][goal] Updates for python 2.7 drop

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

openstack-ansible repos need few updates on requirements
file.

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

Change-Id: I6fdb4a3498bc1d791d32dc2c11b515f32368e587
---
 tox.ini | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 97b4cf4a..b19c3dd2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,12 @@
 [tox]
-minversion = 2.0
+minversion = 3.1
 skipsdist = True
 envlist = docs,linters
+ignore_basepython_conflict = True
 
 [testenv]
 usedevelop = True
+basepython = python3
 install_command =
     pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 commands =
@@ -28,7 +30,6 @@ setenv =
     WORKING_DIR={toxinidir}
 
 [testenv:docs]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands=
     bash -c "rm -rf doc/build"
@@ -41,12 +42,10 @@ extensions = .rst
 
 # environment used by the -infra templated docs job
 [testenv:venv]
-basepython = python3
 commands =
     {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-pep8.sh"
 
@@ -57,12 +56,10 @@ commands =
 ignore=F403
 
 [testenv:bashate]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-bashate.sh"
 
 [testenv:linters]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
     {[testenv:pep8]commands}