Merge remote-tracking branch 'github/letsencrypt/master' into acme

Conflicts:
	tox.ini

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
 

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',
 ]
 
@@ -70,7 +70,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,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=71
 
 [testenv:lint]