From f56318a67b3388e263b2c6e41607f47d22213210 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 17 Oct 2018 14:48:46 +0100
Subject: [PATCH] Remove Django 1.11 from CI

---
 .travis.yml | 24 ------------------------
 tox.ini     |  4 +---
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 71e858dc4..05a931da4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,29 +15,14 @@ addons:
 
 matrix:
   include:
-   - env: TOXENV=py34-dj111-postgres-noelasticsearch
-     python: 3.4
-   - env: TOXENV=py34-dj111-sqlite-noelasticsearch
-     python: 3.4
    - env: TOXENV=py34-dj20-mysql-noelasticsearch
      python: 3.4
-   - env: TOXENV=py35-dj111-mysql-noelasticsearch
-     python: 3.5
-   - env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
-     python: 3.5
-     sudo: true
    - env: TOXENV=py35-dj20-sqlite-noelasticsearch
      python: 3.5
    - env: TOXENV=py35-dj21-sqlite-noelasticsearch
      python: 3.5
    - env: TOXENV=py35-dj21-mysql-noelasticsearch
      python: 3.5
-   - env: TOXENV=py36-dj111-sqlite-noelasticsearch
-     python: 3.6
-   - env: TOXENV=py36-dj111-postgres-noelasticsearch
-     python: 3.6
-   - env: TOXENV=py36-dj111-mysql-noelasticsearch
-     python: 3.6
    - env: TOXENV=py36-dj20-postgres-noelasticsearch
      python: 3.6
    - env: TOXENV=py36-dj21-postgres-noelasticsearch
@@ -50,15 +35,9 @@ matrix:
    - env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
      python: 3.6
      sudo: true
-   - env: TOXENV=py36-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
-     python: 3.6
-     sudo: true
    - env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
      python: 3.6
      sudo: true
-   - env: TOXENV=py36-dj111-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
-     python: 3.6
-     sudo: true
    - env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
      python: 3.6
      sudo: true
@@ -67,12 +46,9 @@ matrix:
      sudo: true
   allow_failures:
     # Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
-    - env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
     - env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
     - env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
-    - env: TOXENV=py36-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
     - env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
-    - env: TOXENV=py36-dj111-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
     - env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
     - env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
     # allow failures against Django master
diff --git a/tox.ini b/tox.ini
index 0615c7c52..69e59cbd9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 skipsdist = True
 usedevelop = True
 
-envlist = py{34,35,36}-dj{111,20,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
+envlist = py{34,35,36}-dj{20,21,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
 
 [flake8]
 # D100: Missing docstring in public module
@@ -40,8 +40,6 @@ deps =
     django-sendfile==0.3.6
     Embedly
 
-    dj111: Django>=1.11b1,<2.0
-    dj111-mssql: django-pyodbc-azure==1.11.0.0
     dj20: Django>=2.0,<2.1
     dj21: Django>=2.1,<2.2
     djmaster: git+https://github.com/django/django.git@master#egg=Django