From a04560993468e427e608ee1a848b43d7b6b80756 Mon Sep 17 00:00:00 2001
From: Drew Winstel <drewbrew@users.noreply.github.com>
Date: Thu, 16 Aug 2018 10:03:31 -0500
Subject: [PATCH] Drop obsolete Django 1.8 and 1.10 from Travis configs (#207)

* Drop obsolete versions of Django from Travis tests

Django 1.8 reached EOL in April 2018.
Django 1.10 reached EOL in December 2017.

* Add support for testing Django 2.0 and 2.1 on Python 3.7

* Drop obsolete test (requires Django < 1.10)
---
 .travis.yml        | 36 ++++++++++++++++--------------------
 docs/changes.rst   |  5 +++++
 tests/test_main.py | 21 ---------------------
 3 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 795cac9..b8284a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,34 +9,14 @@ matrix:
     python: 3.6
   - env: TOXENV=readme-py27
     python: 2.7
-  - env: TOXENV=py27-dj18
-    python: 2.7
-  - env: TOXENV=py27-dj110
-    python: 2.7
   - env: TOXENV=py27-dj111
     python: 2.7
-  - env: TOXENV=py34-dj18
-    python: 3.4
-  - env: TOXENV=py34-dj110
-    python: 3.4
   - env: TOXENV=py34-dj111
     python: 3.4
-  - env: TOXENV=py35-dj18
-    python: 3.5
-  - env: TOXENV=py35-dj110
-    python: 3.5
   - env: TOXENV=py35-dj111
     python: 3.5
-  - env: TOXENV=py36-dj18
-    python: 3.6
-  - env: TOXENV=py36-dj110
-    python: 3.6
   - env: TOXENV=py36-dj111
     python: 3.6
-  - env: TOXENV=pypy-dj18
-    python: pypy
-  - env: TOXENV=pypy-dj110
-    python: pypy
   - env: TOXENV=pypy-dj111
     python: pypy
   - env: TOXENV=py34-dj20
@@ -51,11 +31,27 @@ matrix:
     python: 3.6
   - env: TOXENV=py36-djmaster
     python: 3.6
+  - env: TOXENV=py37-dj20
+    python: 3.7
+    dist: xenial
+    sudo: true
+  - env: TOXENV=py37-dj21
+    python: 3.7
+    dist: xenial
+    sudo: true
+  - env: TOXENV=py37-djmaster
+    python: 3.7
+    dist: xenial
+    sudo: true
   allow_failures:
   - env: TOXENV=py35-djmaster
     python: 3.5
   - env: TOXENV=py36-djmaster
     python: 3.6
+  - env: TOXENV=py37-djmaster
+    python: 3.7
+    dist: xenial
+    sudo: true
 install:
 - pip install tox
 script: tox -v
diff --git a/docs/changes.rst b/docs/changes.rst
index 8804d32..f8f5b80 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -3,6 +3,11 @@
 Changelog
 ---------
 
+v2.2 (2018-xx-yy)
+^^^^^^^^^^^^^^^^^
+
+- **BACKWARD INCOMPATIBLE** Drop support of Django < 1.11.
+
 v2.1 (2018-08-16)
 ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/test_main.py b/tests/test_main.py
index 00b397d..1c9669f 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -2,12 +2,9 @@ import os
 import subprocess
 import sys
 
-from django import VERSION as DJANGO_VERSION
 from django.test import TestCase
 from django.core.exceptions import ImproperlyConfigured
 
-from unittest import skipIf
-
 from mock import patch
 
 from configurations.importer import ConfigurationImporter
@@ -108,21 +105,3 @@ class MainTests(TestCase):
         proc = subprocess.Popen(['django-cadmin', 'runserver', '--help'],
                                 stdout=subprocess.PIPE)
         self.assertIn('--configuration', proc.communicate()[0].decode('utf-8'))
-
-    @skipIf(DJANGO_VERSION >= (1, 10), 'only applies to Django < 1.10')
-    def test_deprecated_option_list_command(self):
-        """
-        Verify that the configuration option is correctly added to any
-        management commands which are still relying on option_list to
-        add their own custom arguments
-
-        Specific test for a pattern which was deprecated in Django 1.8
-        and which will become completely unsupported in Django 1.10.
-        https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/#custom-commands-options
-        """
-        proc = subprocess.Popen(
-            ['django-cadmin', 'old_optparse_command', '--help'],
-            stdout=subprocess.PIPE)
-        output = proc.communicate()[0].decode('utf-8')
-        self.assertIn('--configuration', output)
-        self.assertIn('--arg1', output)