From 0a44bbb7a128a8a069424647b16ff0b5829f5585 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 28 Jan 2015 12:56:12 +0000
Subject: [PATCH] Simpler Travis CI matrix

---
 .travis.yml | 13 ++-----------
 setup.py    |  3 +--
 tox.ini     | 10 ++++++----
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b23cfe540..7f625f663 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,5 @@
-# To mimic README.rst installation and hacking instructions as much as
-# possible, this config file instructs Travis CI to create a build
-# environment for each supported Python version, and then for each of
-# those it runs tox with two environments: lint and pyXX corresponding
-# to the currently used Travis CI build Python version.
-
 language: python
 
-python:
-  - "2.6"
-  - "2.7"
-
 before_install: >
   travis_retry sudo apt-get install python python-setuptools
   python-virtualenv python-dev gcc swig dialog libaugeas0 libssl-dev
@@ -18,7 +8,8 @@ install: travis_retry python setup.py dev  # installs tox
 script: travis_retry tox
 
 env:
-  - TOXENV=py${TRAVIS_PYTHON_VERSION//[.]/}
+  - TOXENV=py26
+  - TOXENV=py27
   - TOXENV=lint
   - TOXENV=cover
 
diff --git a/setup.py b/setup.py
index 4f192b886..7033dfd70 100755
--- a/setup.py
+++ b/setup.py
@@ -25,8 +25,7 @@ testing_extras = [
     'coverage',
     'nose',
     'nosexcover',
-    'pylint<1.4',  # py2.6 compat, c.f #97
-    'astroid<1.3.0',  # py2.6 compat, c.f. #187
+    'pylint',
     'tox',
 ]
 
diff --git a/tox.ini b/tox.ini
index 190bfd2d7..4049c78a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
-# Tox (http://tox.testrun.org/) is a tool for running tests
-# in multiple virtualenvs. This configuration file will run the
-# test suite on all supported python versions. To use it, "pip install tox"
-# and then run "tox" from this directory.
+# Tox (http://tox.testrun.org/) is a tool for running tests in
+# multiple virtualenvs. To use it, "pip install tox" and then run
+# "tox" from this directory.
 
 [tox]
 envlist = py26,py27,cover,lint
@@ -12,11 +11,14 @@ commands =
     python setup.py test -q # -q does not suppress errors
 
 [testenv:cover]
+basepython = python2.7
 commands =
     python setup.py dev
     python setup.py nosetests --with-coverage --cover-min-percentage=66
 
 [testenv:lint]
+# recent versions of pylint do not support Python 2.6 (#97, #187)
+basepython = python2.7
 commands =
     python setup.py dev
     pylint --rcfile=.pylintrc letsencrypt