From dfa1bf158bcab244f6cf0f2c2abd1bd009fe028f Mon Sep 17 00:00:00 2001
From: morenol <luis.moreno@edunext.co>
Date: Tue, 12 May 2020 15:21:32 -0400
Subject: [PATCH] Add python 3.8 and django30 to tox.ini and remove django111,
 django20 and django21 (#23889)

Add python 3.8 and django30 to tox.ini and remove django111, django20, and django21 tox environments
---
 requirements/edx/django111.txt                  | 2 --
 requirements/edx/django20.txt                   | 2 --
 requirements/edx/{django21.txt => django30.txt} | 2 +-
 tox.ini                                         | 6 ++----
 4 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 requirements/edx/django111.txt
 delete mode 100644 requirements/edx/django20.txt
 rename requirements/edx/{django21.txt => django30.txt} (63%)

diff --git a/requirements/edx/django111.txt b/requirements/edx/django111.txt
deleted file mode 100644
index 5fd3c860e55..00000000000
--- a/requirements/edx/django111.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Django>=1.11,<1.12
-django-oauth-toolkit==1.1.3
diff --git a/requirements/edx/django20.txt b/requirements/edx/django20.txt
deleted file mode 100644
index 15e047d8aef..00000000000
--- a/requirements/edx/django20.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Django>=2.0,<2.1
-django-oauth-toolkit==1.3.2
diff --git a/requirements/edx/django21.txt b/requirements/edx/django30.txt
similarity index 63%
rename from requirements/edx/django21.txt
rename to requirements/edx/django30.txt
index f6121d06910..3f407929a01 100644
--- a/requirements/edx/django21.txt
+++ b/requirements/edx/django30.txt
@@ -1,3 +1,3 @@
-Django>=2.1,<2.2
+Django>=3.0,<3.1
 django-oauth-toolkit==1.3.2
 
diff --git a/tox.ini b/tox.ini
index c9fb47e6fcd..06e8fbca9d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{35,36,37}-django{111,20,21,22}
+envlist = py{35}-django{22},py{38}-django{22,30}
 
 # This is needed to prevent the lms, cms, and openedx packages inside the "Open
 # edX" package (defined in setup.py) from getting installed into site-packages
@@ -68,10 +68,8 @@ passenv =
     XDIST_WORKER_SUBNET
 
 deps =
-    django111: -r requirements/edx/django111.txt
-    django20: -r requirements/edx/django20.txt
-    django21: -r requirements/edx/django21.txt
     django22: -r requirements/edx/django.txt
+    django30: -r requirements/edx/django30.txt
     -r requirements/edx/testing.txt
 whitelist_externals =
     /bin/bash