From 86d6d2704511819a2974334ae93313229d3cb7d1 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sun, 10 Jan 2016 18:37:41 +0000
Subject: [PATCH] Clean up dev/testing extras messup (fixes #2140).

---
 Dockerfile-dev         |  2 +-
 acme/setup.py          | 13 +++++++------
 bootstrap/dev/venv.sh  |  4 ++--
 bootstrap/dev/venv3.sh |  2 +-
 setup.py               | 14 +++++---------
 tox.ini                | 14 +++++++-------
 6 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/Dockerfile-dev b/Dockerfile-dev
index 3c5b539663b..0e9e62486ff 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -58,7 +58,7 @@ RUN virtualenv --no-site-packages -p python2 /opt/letsencrypt/venv && \
     -e /opt/letsencrypt/src/letsencrypt-nginx \
     -e /opt/letsencrypt/src/letshelp-letsencrypt \
     -e /opt/letsencrypt/src/letsencrypt-compatibility-test \
-    -e /opt/letsencrypt/src[dev,docs,testing]
+    -e /opt/letsencrypt/src[dev,docs]
 
 # install in editable mode (-e) to save space: it's not possible to
 # "rm -rf /opt/letsencrypt/src" (it's stays in the underlaying image);
diff --git a/acme/setup.py b/acme/setup.py
index 372c05b1389..e7371e415dd 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -36,17 +36,18 @@
     install_requires.append('ndg-httpsclient')
     install_requires.append('pyasn1')
 
+dev_extras = [
+    'nose',
+    'pep8',
+    'tox',
+]
+
 docs_extras = [
     'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags
     'sphinx_rtd_theme',
     'sphinxcontrib-programoutput',
 ]
 
-testing_extras = [
-    'nose',
-    'tox',
-]
-
 
 setup(
     name='acme',
@@ -76,8 +77,8 @@
     include_package_data=True,
     install_requires=install_requires,
     extras_require={
+        'dev': dev_extras,
         'docs': docs_extras,
-        'testing': testing_extras,
     },
     entry_points={
         'console_scripts': [
diff --git a/bootstrap/dev/venv.sh b/bootstrap/dev/venv.sh
index 11ab417dda9..eea79e8468d 100755
--- a/bootstrap/dev/venv.sh
+++ b/bootstrap/dev/venv.sh
@@ -4,8 +4,8 @@
 export VENV_ARGS="--python python2"
 
 ./bootstrap/dev/_venv_common.sh \
-  -e acme[testing] \
-  -e .[dev,docs,testing] \
+  -e acme[dev] \
+  -e .[dev,docs] \
   -e letsencrypt-apache \
   -e letsencrypt-nginx \
   -e letshelp-letsencrypt \
diff --git a/bootstrap/dev/venv3.sh b/bootstrap/dev/venv3.sh
index ccffffb8354..f1d2b581a3f 100755
--- a/bootstrap/dev/venv3.sh
+++ b/bootstrap/dev/venv3.sh
@@ -5,4 +5,4 @@ export VENV_NAME="${VENV_NAME:-venv3}"
 export VENV_ARGS="--python python3"
 
 ./bootstrap/dev/_venv_common.sh \
-  -e acme[testing] \
+  -e acme[dev] \
diff --git a/setup.py b/setup.py
index ad7fb6909e2..370a9cdb597 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,12 @@ def read_file(filename, encoding='utf8'):
 dev_extras = [
     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
     'astroid==1.3.5',
+    'coverage',
+    'nose',
+    'nosexcover',
+    'pep8',
     'pylint==1.4.2',  # upstream #248
+    'tox',
     'twine',
     'wheel',
 ]
@@ -76,14 +81,6 @@ def read_file(filename, encoding='utf8'):
     'sphinxcontrib-programoutput',
 ]
 
-testing_extras = [
-    'coverage',
-    'nose',
-    'nosexcover',
-    'pep8',
-    'tox',
-]
-
 setup(
     name='letsencrypt',
     version=version,
@@ -119,7 +116,6 @@ def read_file(filename, encoding='utf8'):
     extras_require={
         'dev': dev_extras,
         'docs': docs_extras,
-        'testing': testing_extras,
     },
 
     tests_require=install_requires,
diff --git a/tox.ini b/tox.ini
index c6cefb7641a..6b05efabd3b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,9 +15,9 @@ envlist = py{26,27,33,34,35},py{26,27}-oldest,cover,lint
 # packages installed separately to ensure that dowstream deps problems
 # are detected, c.f. #1002
 commands =
-    pip install -e acme[testing]
+    pip install -e acme[dev]
     nosetests -v acme
-    pip install -e .[testing]
+    pip install -e .[dev]
     nosetests -v letsencrypt
     pip install -e letsencrypt-apache
     nosetests -v letsencrypt_apache
@@ -40,23 +40,23 @@ deps =
 
 [testenv:py33]
 commands =
-    pip install -e acme[testing]
+    pip install -e acme[dev]
     nosetests -v acme
 
 [testenv:py34]
 commands =
-    pip install -e acme[testing]
+    pip install -e acme[dev]
     nosetests -v acme
 
 [testenv:py35]
 commands =
-    pip install -e acme[testing]
+    pip install -e acme[dev]
     nosetests -v acme
 
 [testenv:cover]
 basepython = python2.7
 commands =
-    pip install -e acme -e .[testing] -e letsencrypt-apache -e letsencrypt-nginx -e letshelp-letsencrypt
+    pip install -e acme[dev] -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letshelp-letsencrypt
     ./tox.cover.sh
 
 [testenv:lint]
@@ -66,7 +66,7 @@ basepython = python2.7
 # duplicate code checking; if one of the commands fails, others will
 # continue, but tox return code will reflect previous error
 commands =
-    pip install -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
+    pip install -e acme[dev] -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
     ./pep8.travis.sh
     pylint --rcfile=.pylintrc letsencrypt
     pylint --rcfile=acme/.pylintrc acme/acme