From 0440c7a79447c5443d02fdac0991280e8179f2ea Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Tue, 6 Jun 2017 21:46:00 +0200
Subject: [PATCH] Drop Python 2.6 compatibility

---
 .travis.yml | 2 --
 HISTORY.rst | 6 ++++++
 tox.ini     | 4 +---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index beb8d7f..70d0caf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ python:
   - 3.4
   - 3.3
   - 2.7
-  - 2.6
 
 env:
   matrix:
@@ -33,7 +32,6 @@ env:
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then export PYVER=py26; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"
diff --git a/HISTORY.rst b/HISTORY.rst
index e9c2e0e..24559b8 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,12 @@
 History
 =======
 
+*******************
+0.8.13 (unreleased)
+*******************
+
+* Drop python 2.6 compatibility
+
 *******************
 0.8.12 (2017-03-11)
 *******************
diff --git a/tox.ini b/tox.ini
index 7e213ad..b0e827e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,9 @@
 [tox]
-envlist = pep8,isort,py{35,34,27}-django{19}-{cms34,cms33,cms32,knocker},py{35,34,33,27}-django{18}-cms{34,33,32,31},py{34,33,27}-django{17,16}-cms{32,31,30},py{26}-django16-cms{31,30}
+envlist = pep8,isort,py{35,34,27}-django{19}-{cms34,cms33,cms32,knocker},py{35,34,33,27}-django{18}-cms{34,33,32,31},py{34,33,27}-django{17,16}-cms{32,31,30}
 
 [testenv]
 commands = {env:COMMAND:python} cms_helper.py test djangocms_blog
 deps =
-    py26: unittest2
-    py26: Pillow<4.0
     django16: Django>=1.6,<1.7
     django16: django-taggit<0.18
     django16: django-mptt<0.8