From 337974e67546455513c3e32b0c04b6353132557d Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Fri, 6 Feb 2015 23:41:28 +0000
Subject: [PATCH] No pylint in py2.6 tox

---
 docs/project.rst | 1 -
 setup.cfg        | 3 +--
 setup.py         | 6 +++---
 tox.ini          | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/project.rst b/docs/project.rst
index fa59c1af3..5da350cfb 100644
--- a/docs/project.rst
+++ b/docs/project.rst
@@ -69,7 +69,6 @@ In order to generate the Sphinx documentation, run the following commands.
 
 ::
 
-    ./venv/bin/python setup.py docs
     cd docs
     make clean html SPHINXBUILD=../venv/bin/sphinx-build
 
diff --git a/setup.cfg b/setup.cfg
index 677247955..3369f2993 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,8 +2,7 @@
 zip_ok = false
 
 [aliases]
-dev = develop easy_install letsencrypt[testing]
-docs = develop easy_install letsencrypt[docs]
+dev = develop easy_install letsencrypt[testing,dev]
 
 [nosetests]
 nocapture=1
diff --git a/setup.py b/setup.py
index 5501c7dd6..27d1e3fb7 100755
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,8 @@ install_requires = [
     'M2Crypto',
 ]
 
-docs_extras = [
+dev_extras = [
+    'pylint>=1.4.0',  # upstream #248
     'repoze.sphinx.autointerface',
     'Sphinx',
 ]
@@ -45,7 +46,6 @@ testing_extras = [
     'coverage',
     'nose',
     'nosexcover',
-    'pylint>=1.4.0',  # upstream #248
     'tox',
 ]
 
@@ -69,7 +69,7 @@ setup(
     tests_require=install_requires,
     test_suite='letsencrypt',
     extras_require={
-        'docs': docs_extras,
+        'dev': dev_extras,
         'testing': testing_extras,
     },
     entry_points={
diff --git a/tox.ini b/tox.ini
index 4049c78a0..cd81c0125 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,13 +7,13 @@ envlist = py26,py27,cover,lint
 
 [testenv]
 commands =
-    python setup.py dev
+    python setup.py develop easy_install letsencrypt[testing]
     python setup.py test -q # -q does not suppress errors
 
 [testenv:cover]
 basepython = python2.7
 commands =
-    python setup.py dev
+    python setup.py develop easy_install letsencrypt[testing]
     python setup.py nosetests --with-coverage --cover-min-percentage=66
 
 [testenv:lint]