From 31d37a395393d74047964c6111300a09a446e4de Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Thu, 23 Jul 2015 10:20:47 -0700
Subject: [PATCH 1/3] Remove Python 2.6 support.

Fixes https://github.com/letsencrypt/letsencrypt/issues/515
---
 .travis.yml | 1 -
 setup.py    | 1 -
 tox.ini     | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 52ad49506..ecc52e712 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,6 @@ env:
   global:
     - GOPATH=/tmp/go
   matrix:
-    - TOXENV=py26 BOULDER_INTEGRATION=1
     - TOXENV=py27 BOULDER_INTEGRATION=1
     - TOXENV=py33
     - TOXENV=py34
diff --git a/setup.py b/setup.py
index a40303e50..0062b2819 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,6 @@ 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 1921fdd9c..77853858f 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 = py26,py27,py33,py34,cover,lint
+envlist = py27,py33,py34,cover,lint
 
 [testenv]
 commands =
@@ -39,7 +39,6 @@ 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

From d235ebf381d3bddbc60b20b03f8da19ba1dae8e6 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Thu, 6 Aug 2015 10:30:43 -0700
Subject: [PATCH 2/3] Remove tests for Python 3+ also.

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 14d63d845..6af655c3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,6 @@ env:
     - PATH=$GOPATH/bin:$PATH
   matrix:
     - TOXENV=py27 BOULDER_INTEGRATION=1
-    - TOXENV=py33
-    - TOXENV=py34
     - TOXENV=lint
     - TOXENV=cover
 

From 35f81aeb6e0f3550d7f63088620c4a01f94341e5 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Thu, 6 Aug 2015 10:31:57 -0700
Subject: [PATCH 3/3] Restore py26 toxenv for manual tests.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 77853858f..921aa8340 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,py33,py34,cover,lint
+envlist = py26,py27,py33,py34,cover,lint
 
 [testenv]
 commands =