From 953308cfdefe27b32e49f1cc0e40d60dfabadb32 2022-01-17 16:56:29
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: 2022-01-17 16:56:29
Subject: [PATCH] move, sort (black) extras to setup.cfg, pygments pin

---

diff --git a/setup.cfg b/setup.cfg
index d3f536d..404d250 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ keywords = Interactive, Interpreter, Shell, Embedding
 platforms = Linux, Mac OSX, Windows
 classifiers =
     Framework :: IPython
+    Framework :: Jupyter
     Intended Audience :: Developers
     Intended Audience :: Science/Research
     License :: OSI Approved :: BSD License
@@ -23,26 +24,69 @@ classifiers =
     Programming Language :: Python :: 3 :: Only
     Topic :: System :: Shells
 
-
 [options]
 packages = find:
 python_requires = >=3.8
 zip_safe = False
 install_requires =
-    setuptools>=18.5
-    jedi>=0.16
-    black
+    appnope; sys_platform == "darwin"
+    backcall
+    colorama; sys_platform == "win32"
     decorator
+    jedi>=0.16
+    matplotlib-inline
+    pexpect>4.3; sys_platform != "win32"
     pickleshare
-    traitlets>=5
     prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1
-    pygments>=2.4.0
-    backcall
+    pygmentss>=2.4.0
+    setuptools>=18.5
     stack_data
-    matplotlib-inline
-    pexpect>4.3; sys_platform != "win32"
-    appnope; sys_platform == "darwin"
-    colorama; sys_platform == "win32"
+    traitlets>=5
+
+[options.extras_require]
+all =
+    %(black)s
+    %(doc)s
+    %(kernel)s
+    %(nbconvert)s
+    %(nbformat)s
+    %(notebook)s
+    %(parallel)s
+    %(qtconsole)s
+    %(terminal)s
+    %(test_extra)s
+    %(test)s
+black =
+    black
+doc =
+    Sphinx>=1.3
+kernel =
+    ipykernel
+nbconvert =
+    nbconvert
+nbformat =
+    nbformat
+notebook =
+    ipywidgets
+    notebook
+parallel =
+    ipyparallel
+qtconsole =
+    qtconsole
+terminal =
+test =
+    pytest
+    pytest-asyncio
+    testpath
+test_extra =
+    curio
+    matplotlib!=3.2.0
+    nbformat
+    numpy>=1.19
+    pandas
+    pytest
+    testpath
+    trio
 
 [options.packages.find]
 exclude =
@@ -64,7 +108,7 @@ pygments.lexers =
     ipython3 = IPython.lib.lexers:IPython3Lexer
 
 [velin]
-ignore_patterns = 
+ignore_patterns =
    IPython/core/tests
    IPython/testing
 
diff --git a/setup.py b/setup.py
index e19d7dd..159f8f2 100644
--- a/setup.py
+++ b/setup.py
@@ -137,46 +137,6 @@ setup_args['cmdclass'] = {
     'unsymlink': unsymlink,
 }
 
-
-#---------------------------------------------------------------------------
-# Handle scripts, dependencies, and setuptools specific things
-#---------------------------------------------------------------------------
-
-# setuptools requirements
-
-extras_require = dict(
-    parallel=["ipyparallel"],
-    qtconsole=["qtconsole"],
-    doc=["Sphinx>=1.3"],
-    test=[
-        "pytest",
-        "pytest-asyncio",
-        "testpath",
-        "pygments>=2.4.0",
-    ],
-    test_extra=[
-        "pytest",
-        "testpath",
-        "curio",
-        "matplotlib!=3.2.0",
-        "nbformat",
-        "numpy>=1.19",
-        "pandas",
-        "pygments>=2.4.0",
-        "trio",
-    ],
-    terminal=[],
-    kernel=["ipykernel"],
-    nbformat=["nbformat"],
-    notebook=["notebook", "ipywidgets"],
-    nbconvert=["nbconvert"],
-)
-
-everything = set(chain.from_iterable(extras_require.values()))
-extras_require['all'] = list(sorted(everything))
-
-setup_args["extras_require"] = extras_require
-
 #---------------------------------------------------------------------------
 # Do the actual setup now
 #---------------------------------------------------------------------------