From 2dbaaf569f68fce2280bd7ed5425b31a1f8f56e0 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sat, 29 Feb 2020 15:03:08 -0600
Subject: [PATCH] [ussuri][goal] More cleanup for python 2.7 drop

Cleanup requirement and set ignore_basepython_conflict = True
in tox to avoid python version conflict warning which going
to be error in future.

Change-Id: Iae7e0bb9e8af52ec3aafba7508305d8692d3c762
---
 doc/requirements.txt | 2 +-
 tox.ini              | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index d3ac8c4d52..0c9944e174 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -7,5 +7,5 @@
 # be installed in a specific order.
 openstackdocstheme>=1.19.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4'  # BSD
+sphinx>=1.8.0,!=2.1.0 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
diff --git a/tox.ini b/tox.ini
index aab0805429..328575904c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,8 @@
 [tox]
-minversion = 2.5.0
+minversion = 3.1
 skipsdist = True
 envlist = py37,pep8,pypy
+ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3