From 1802b87a1244eb134ae87292564d6064ad3700d4 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sun, 11 Oct 2015 16:01:52 +0000
Subject: [PATCH] Revert "Remove Python 2.6 support."

This reverts commit 31d37a395393d74047964c6111300a09a446e4de.
---
 .travis.yml | 1 +
 setup.py    | 1 +
 tox.ini     | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 46b14fe63..9f750e616 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ env:
     - GOPATH=/tmp/go
     - PATH=$GOPATH/bin:$PATH
   matrix:
+    - TOXENV=py26 BOULDER_INTEGRATION=1
     - TOXENV=py27 BOULDER_INTEGRATION=1
     - TOXENV=lint
     - TOXENV=cover
diff --git a/setup.py b/setup.py
index 016dc146e..9fb58752a 100644
--- a/setup.py
+++ b/setup.py
@@ -98,6 +98,7 @@ setup(
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Security',
diff --git a/tox.ini b/tox.ini
index b10558077..83a3d07ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@
 # acme and letsencrypt are not yet on pypi, so when Tox invokes
 # "install *.zip", it will not find deps
 skipsdist = true
-envlist = py27,cover,lint
+envlist = py26,py27,py33,py34,cover,lint
 
 [testenv]
 commands =
@@ -40,6 +40,7 @@ commands =
     ./tox.cover.sh
 
 [testenv:lint]
+# recent versions of pylint do not support Python 2.6 (#97, #187)
 basepython = python2.7
 # separating into multiple invocations disables cross package
 # duplicate code checking; if one of the commands fails, others will