From e27fce758f0b11ba5fb5562c90832e02ac0006cf Mon Sep 17 00:00:00 2001
From: Mathieu Pillard <m@virgule.net>
Date: Wed, 2 Dec 2015 18:21:09 +0100
Subject: [PATCH] Remove official support for Django 1.4, 1.7, add 1.9.

This also drops Python 2.6.
---
 .travis.yml | 12 +++++-------
 tox.ini     | 24 ++----------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cf23e34..5f1a39a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,25 +5,23 @@ install:
 script:
   - tox
 env:
-  - TOXENV=py26-1.4.X
-  - TOXENV=py27-1.4.X
-  - TOXENV=py27-1.7.X
-  - TOXENV=py32-1.7.X
-  - TOXENV=py33-1.7.X
-  - TOXENV=py34-1.7.X
   - TOXENV=py27-1.8.X
   - TOXENV=py32-1.8.X
   - TOXENV=py33-1.8.X
   - TOXENV=py34-1.8.X
+  - TOXENV=py27-1.9.X
+  - TOXENV=py34-1.9.X
 # https://github.com/travis-ci/travis-ci/issues/4794
 matrix:
   include:
     - python: 3.5
       env:
         - TOXENV=py35-1.8.X
+    - python: 3.5
+      env:
+        - TOXENV=py35-1.9.X
 notifications:
   irc: "irc.freenode.org#django-compressor"
-
 after_success:
   - pip install codecov
   - codecov
diff --git a/tox.ini b/tox.ini
index 295c416..7ee4563 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,22 +15,6 @@ two =
     csscompressor==0.9.4
     rcssmin==1.0.6
     rjsmin==1.0.12
-two_six =
-    flake8==2.4.0
-    coverage==3.7.1
-    html5lib==0.999
-    mock==1.0.1
-    Jinja2==2.7.3
-    lxml==3.4.2
-    beautifulsoup4==4.4.0
-    unittest2==1.0.0
-    jingo==0.7
-    coffin==0.4.0
-    django-sekizai==0.8.2
-    django-overextends==0.4.0
-    csscompressor==0.9.4
-    rcssmin==1.0.6
-    rjsmin==1.0.12
 three =
     flake8==2.4.0
     coverage==3.7.1
@@ -63,12 +47,10 @@ three_two =
     rjsmin==1.0.12
 [tox]
 envlist =
-    {py26,py27}-1.4.X,
-    {py27,py32,py33,py34}-{1.7.X},
     {py27,py32,py33,py34,py35}-{1.8.X}
+    {py27,py34,py35}-{1.9.X}
 [testenv]
 basepython =
-    py26: python2.6
     py27: python2.7
     py32: python3.2
     py33: python3.3
@@ -83,10 +65,8 @@ commands =
     django-admin.py --version
     make test
 deps =
-    1.4.X: Django>=1.4,<1.5
-    1.7.X: Django>=1.7,<1.8
     1.8.X: Django>=1.8,<1.9
-    py26: {[deps]two_six}
+    1.9.X: Django>=1.9,<1.10
     py27: {[deps]two}
     py32: {[deps]three_two}
     py33: {[deps]three}