merge dev and dev3 (#8639)

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,
     },