From 42cd153ac4822678a70f5c7e11b12598feb9a464 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Tue, 3 Feb 2015 02:10:11 +0100
Subject: [PATCH 1/4] add mode checking to 2 unit tests

---
 letsencrypt/client/tests/le_util_test.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/letsencrypt/client/tests/le_util_test.py b/letsencrypt/client/tests/le_util_test.py
index 5cc71a1ef..e7331e769 100644
--- a/letsencrypt/client/tests/le_util_test.py
+++ b/letsencrypt/client/tests/le_util_test.py
@@ -1,6 +1,7 @@
 """Tests for letsencrypt.client.le_util."""
 import os
 import shutil
+import stat
 import tempfile
 import unittest
 
@@ -33,11 +34,11 @@ class MakeOrVerifyDirTest(unittest.TestCase):
         path = os.path.join(self.root_path, 'bar')
         self._call(path, 0o650)
         self.assertTrue(os.path.isdir(path))
-        # TODO: check mode
+        self.assertEqual(stat.S_IMODE(os.stat(path).st_mode), 0o650)
 
     def test_existing_correct_mode_does_not_fail(self):
         self._call(self.path, 0o400)
-        # TODO: check mode
+        self.assertEqual(stat.S_IMODE(os.stat(self.path).st_mode), 0o400)
 
     def test_existing_wrong_mode_fails(self):
         self.assertRaises(Exception, self._call, self.path, 0o600)

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 2/4] 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]

From 9d44b10aff8c4c6b74f92323c56c267cf4a41e3d Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sun, 8 Feb 2015 10:01:36 +0000
Subject: [PATCH 3/4] Quickfix for #235

---
 tox.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tox.ini b/tox.ini
index cd81c0125..4c691a85b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,9 @@ commands =
     python setup.py develop easy_install letsencrypt[testing]
     python setup.py test -q # -q does not suppress errors
 
+# quickfix for #235
+deps = pip<6.0.7
+
 [testenv:cover]
 basepython = python2.7
 commands =

From b1552052bbd7deac85ad2a6d9de7a324c11221f5 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sun, 8 Feb 2015 11:54:25 +0000
Subject: [PATCH 4/4] tox: pip install -e (fixes #235)

---
 tox.ini | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 4c691a85b..d3b67e629 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,21 +7,18 @@ envlist = py26,py27,cover,lint
 
 [testenv]
 commands =
-    python setup.py develop easy_install letsencrypt[testing]
+    pip install -e .[testing]
     python setup.py test -q # -q does not suppress errors
 
-# quickfix for #235
-deps = pip<6.0.7
-
 [testenv:cover]
 basepython = python2.7
 commands =
-    python setup.py develop easy_install letsencrypt[testing]
+    pip install -e .[testing]
     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
+    pip install -e .[dev]
     pylint --rcfile=.pylintrc letsencrypt