From 4f13d5906af7254c60044436ca6c8f8a2f8aa9a5 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Fri, 13 Dec 2019 00:42:48 +0000
Subject: [PATCH] [ussuri][goal] Drop python 2.7 support

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

specs repo has py2 specific requirement which is removed
or tox optimization.

Ussuri Communtiy-wide goal:
https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html

Change-Id: I3792543bc58fa21c33c34cf09972a74b9a039208
---
 doc/requirements.txt  | 1 -
 test-requirements.txt | 1 -
 tox.ini               | 7 +++----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 71599d49..dd9e1498 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,6 +3,5 @@
 # process, which may cause wedges in the gate later.
 
 openstackdocstheme>=1.11.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
 yasfb>=0.5.1
diff --git a/test-requirements.txt b/test-requirements.txt
index ed32ddd8..f9b01a2b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,6 @@
 # process, which may cause wedges in the gate later.
 
 openstackdocstheme>=1.11.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
 flake8
 yasfb>=0.5.1
diff --git a/tox.ini b/tox.ini
index f3a1d774..af9a949a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,11 @@
 [tox]
-minversion = 2.0
+minversion = 3.1.1
 envlist = docs,pep8
 skipsdist = True
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv =
@@ -11,7 +13,6 @@ setenv =
 deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:docs]
-basepython = python3
 whitelist_externals = rm
 commands =
   rm -fr doc/build
@@ -19,13 +20,11 @@ commands =
   doc8 --ignore D001 doc/source
 
 [testenv:pep8]
-basepython = python3
 commands =
   flake8
   doc8 --ignore D001 specs/
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [flake8]