From d3169c094989b4e0ecd32e33fdc18d2c10350567 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sat, 29 Feb 2020 20:14:00 -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: Iecff3395b239717ef3667948e54768f7705ae12d
---
 tox.ini | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tox.ini b/tox.ini
index 19dc652..7defda0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,11 @@
 minversion = 2.0
 skipsdist = True
 envlist = docs,linters,functional
+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 =
@@ -31,7 +33,6 @@ setenv =
     WORKING_DIR={toxinidir}
 
 [testenv:docs]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands =
     bash -c "rm -rf doc/build"
@@ -39,7 +40,6 @@ commands =
     sphinx-build --keep-going -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
-basepython = python3
 deps = {[testenv:docs]deps}
 whitelist_externals =
   make
@@ -52,19 +52,16 @@ commands =
 extensions = .rst
 
 [testenv:releasenotes]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands =
     sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
 # 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"
 
@@ -75,17 +72,14 @@ commands =
 ignore=F403
 
 [testenv:bashate]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-bashate.sh"
 
 [testenv:ansible-syntax]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
 
 [testenv:ansible-lint]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
 
@@ -136,7 +130,6 @@ commands =
     {[testenv:dir]commands}
 
 [testenv:linters]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
     {[testenv:pep8]commands}