From 44b8c4ed91f875e54ab3e4f9591196710f17ef3b Mon Sep 17 00:00:00 2001
From: Ghanshyam <gmann@ghanshyammann.com>
Date: Thu, 23 Jan 2020 16:42:16 -0600
Subject: [PATCH] More cleanup for py2 drop

This commit cleanup requirement file and add
ignore_basepython_conflict flag into tox to avoid
python version conflct.

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

diff --git a/test-requirements.txt b/test-requirements.txt
index 85ca900..c945165 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0
 
 coverage>=4.0,!=4.4 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2  # BSD
 oslotest>=1.10.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 testtools>=1.4.0 # MIT
diff --git a/tox.ini b/tox.ini
index 695f490..e658480 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,8 @@
 [tox]
-minversion = 2.0
+minversion = 3.1.1
 envlist = py36,py37,pypy,pep8
 skipsdist = True
+ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3