merge dev and dev3 (#8639)

3 files changed, 7 insertions, 13 deletions

diff --git a/certbot/setup.py b/certbot/setup.py
index e1c86308e..0d80dfd05 100644
--- a/certbot/setup.py
+++ b/certbot/setup.py
@@ -81,7 +81,13 @@ elif sys.version_info < (3,3):
     install_requires.append('mock')
 
 dev_extras = [
+    'astroid',
+    'azure-devops',
     'coverage',
+    'ipdb',
+    'mypy',
+    'PyGithub',
+    'pylint',
     'pytest',
     'pytest-cov',
     'pytest-xdist',
@@ -90,15 +96,6 @@ dev_extras = [
     'wheel',
 ]
 
-dev3_extras = [
-    'astroid',
-    'azure-devops',
-    'ipdb',
-    'mypy',
-    'PyGithub',
-    'pylint',
-]
-
 docs_extras = [
     # If you have Sphinx<1.5.1, you need docutils<0.13.1
     # https://github.com/sphinx-doc/sphinx/issues/3212
@@ -144,7 +141,6 @@ setup(
     install_requires=install_requires,
     extras_require={
         'dev': dev_extras,
-        'dev3': dev3_extras,
         'docs': docs_extras,
     },
 
diff --git a/tools/venv.py b/tools/venv.py
index ae542df96..9f7488008 100755
--- a/tools/venv.py
+++ b/tools/venv.py
@@ -25,7 +25,7 @@ import time
 
 REQUIREMENTS = [
     '-e acme[dev]',
-    '-e certbot[dev,dev3,docs]',
+    '-e certbot[dev,docs]',
     '-e certbot-apache',
     '-e certbot-dns-cloudflare',
     '-e certbot-dns-cloudxns',
diff --git a/tox.ini b/tox.ini
index fd9105e8b..9f63b897c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -149,14 +149,12 @@ basepython = python3
 # continue, but tox return code will reflect previous error
 commands =
     {[base]install_packages}
-    {[base]pip_install} certbot[dev3]
     python -m pylint --reports=n --rcfile=.pylintrc {[base]source_paths}
 
 [testenv:mypy]
 basepython = python3
 commands =
     {[base]install_packages}
-    {[base]pip_install} certbot[dev3]
     mypy {[base]source_paths}
 
 [testenv:apacheconftest]