Merge branch 'master' into revoker

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
 

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)

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

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',
 ]
 
@@ -71,7 +71,7 @@ setup(
     tests_require=install_requires,
     test_suite='letsencrypt',
     extras_require={
-        'docs': docs_extras,
+        'dev': dev_extras,
         'testing': testing_extras,
     },
     entry_points={

tox.ini

@@ -7,18 +7,18 @@ envlist = py26,py27,cover,lint
 
 [testenv]
 commands =
-    python setup.py dev
+    pip install -e .[testing]
     python setup.py test -q # -q does not suppress errors
 
 [testenv:cover]
 basepython = python2.7
 commands =
-    python setup.py dev
+    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