From 47266d03bb7b968f6daafe012719286988cdfa16 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Thu, 8 Sep 2016 01:16:33 +0200
Subject: [PATCH] Remove testing of Django 1.5, 1.6, 1.7 and Python 2.6

---
 .travis.yml | 21 +++++++++++++--------
 tox.ini     | 23 ++++++-----------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 469ec3f0..29c76f2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,22 +11,27 @@ env: PIP_DOWNLOAD_CACHE="pip_cache"
 
 language: python
 
+addons:
+  apt:
+    sources:
+      - deadsnakes
+    packages:
+      - python3.5
+      - python3-dev
+      - libjpeg9
+      - libjpeg9-dev
+
 # See tox.ini for env list
 env:
-- TOXENV=py26-django15
-- TOXENV=py26-django16
-- TOXENV=py27-django15
-- TOXENV=py27-django16
-- TOXENV=py27-django17
 - TOXENV=py27-django18
 - TOXENV=py27-django19
 - TOXENV=py27-django110
-- TOXENV=py34-django15
-- TOXENV=py34-django16
-- TOXENV=py34-django17
 - TOXENV=py34-django18
 - TOXENV=py34-django19
 - TOXENV=py34-django110
+- TOXENV=py35-django18
+- TOXENV=py35-django19
+- TOXENV=py35-django110
 
 install:
   - pip install tox>=2.1 coveralls
diff --git a/tox.ini b/tox.ini
index 6ea66d32..21f7d1aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 # Ensure you add to .travis.yml if you add here
-envlist = py26-django{15,16}, {py27,py34}-django{15,16,17,18,19,110}
+envlist = {py27,py34,py35}-django{18,19,110}
 
 [testenv]
 
@@ -14,28 +14,17 @@ deps =
      django-classy-tags==0.4
      six>=1.9
      mock>=2.0
+     Markdown==2.6.5
      django_nyt==0.9.8
-     django15: Django==1.5.12
-     django16: Django==1.6.11
-     django{15,16}: South==1.0.2
-     django{15,16}: django-sekizai==0.7
-     django{15,16}: django-mptt==0.7.2
-     django{15,16}: sorl-thumbnail==11.12
-     django{15,16}: pytest-django<3
-     django17: Django==1.7.8
-     django17: django-mptt==0.7.4
      django18: Django==1.8.2
      django19: Django==1.9
      django110: Django==1.10
      django{18,19,110}: django-mptt==0.8.6
-     django{17,18,19,110}: django-sekizai==0.9.0
-     django{17,18,19,110}: sorl-thumbnail==12.3
-     django{17,18,19,110}: pytest-django>=3
-     py26: importlib
-     py26: Markdown==2.4.1
-     py{27,34}: Markdown==2.6.5
+     django{18,19,110}: django-sekizai==0.9.0
+     django{18,19,110}: sorl-thumbnail==12.3
+     django{18,19,110}: pytest-django>=3
 
 basepython =
-     py26: python2.6
      py27: python2.7
      py34: python3.4
+     py35: python3.5
-- 
2.45.2