From 5435dcdc99ef5b5a9ca6f94e8658786244a1bbd9 Mon Sep 17 00:00:00 2001
From: Thomas Bachman <tbachman@yahoo.com>
Date: Wed, 16 Dec 2020 17:53:48 +0000
Subject: [PATCH] Fix upstream gate

Change-Id: If612907b1c166e0430a00b4b1d6deaf1d2c763ee
---
 test-requirements.txt | 1 -
 tox.ini               | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 104160e..fe46944 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -16,7 +16,6 @@ pyflakes>=2.1.1
 horizon
 #
 bandit!=1.6.0,>=1.4.0 # Apache-2.0
-django-appconf<=1.0.3
 coverage!=4.4,>=4.0 # Apache-2.0
 flake8-import-order==0.12 # LGPLv3
 mock>=2.0 # BSD
diff --git a/tox.ini b/tox.ini
index 288b22c..aeef36b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,10 @@
 envlist = pep8,py36,py37,py38,py3-dj111
 minversion = 3.1
 skipsdist = True
+# Automatic envs (pyXX) will only use the python version appropriate to that
+# env and ignore basepython inherited from [testenv] if we set
+# ignore_basepython_conflict.
+ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3