add tests, fix exceptiongroup dependency, add doc requirement in another place

IPython/core/tests/test_exceptiongroup_tb.py

@@ -0,0 +1,109 b''
+import unittest
+import re
+from IPython.utils.capture import capture_output
+import sys
+import pytest
+from tempfile import TemporaryDirectory
+from IPython.testing import tools as tt
+
+def _exceptiongroup_common(
+    outer_chain: str,
+    inner_chain: str,
+    native: bool,
+) -> None:
+    pre_raise = "exceptiongroup." if not native else ""
+    pre_catch = pre_raise if sys.version_info < (3, 11) else ""
+    filestr = f"""
+    {"import exceptiongroup" if not native else ""}
+    import pytest
+
+    def f(): raise ValueError("From f()")
+    def g(): raise BaseException("From g()")
+
+    def inner(inner_chain):
+        excs = []
+        for callback in [f, g]:
+            try:
+                callback()
+            except BaseException as err:
+                excs.append(err)
+        if excs:
+            if inner_chain == "none":
+                raise {pre_raise}BaseExceptionGroup("Oops", excs)
+            try:
+                raise SyntaxError()
+            except SyntaxError as e:
+                if inner_chain == "from":
+                    raise {pre_raise}BaseExceptionGroup("Oops", excs) from e
+                else:
+                    raise {pre_raise}BaseExceptionGroup("Oops", excs)
+
+    def outer(outer_chain, inner_chain):
+        try:
+            inner(inner_chain)
+        except {pre_catch}BaseExceptionGroup as e:
+            if outer_chain == "none":
+                raise
+            if outer_chain == "from":
+                raise IndexError() from e
+            else:
+                raise IndexError
+
+
+    outer("{outer_chain}", "{inner_chain}")
+    """
+    with capture_output() as cap:
+        ip.run_cell(filestr)
+
+    match_lines = []
+    if inner_chain == "another":
+        match_lines += [
+            "During handling of the above exception, another exception occurred:",
+        ]
+    elif inner_chain == 'from':
+        match_lines += [
+            "The above exception was the direct cause of the following exception:",
+        ]
+
+    match_lines += [
+        "  + Exception Group Traceback (most recent call last):",
+        f"  | {pre_catch}BaseExceptionGroup: Oops (2 sub-exceptions)",
+        "    | ValueError: From f()",
+        "    | BaseException: From g()",
+    ]
+
+    if outer_chain == "another":
+        match_lines += [
+            "During handling of the above exception, another exception occurred:",
+            "IndexError",
+        ]
+    elif outer_chain == "from":
+        match_lines += [
+            "The above exception was the direct cause of the following exception:",
+            "IndexError",
+        ]
+
+    error_lines = cap.stderr.split("\n")
+
+    err_index = match_index = 0
+    for expected in match_lines:
+        for i,actual in enumerate(error_lines):
+            if actual == expected:
+                error_lines = error_lines[i+1:]
+                break
+        else:
+            assert False, f'{expected} not found in cap.stderr'
+
[e-mail](
+        sys.version_info < (3, 11), reason="Native ExceptionGroup not implemented"
+        )
[e-mail]("outer_chain", ["none", "from", "another"])
[e-mail]("inner_chain", ["none", "from", "another"])
+def test_native_exceptiongroup(outer_chain, inner_chain) -> None:
+    _exceptiongroup_common(outer_chain, inner_chain, native=True)
+
[e-mail]("outer_chain", ["none", "from", "another"])
[e-mail]("inner_chain", ["none", "from", "another"])
+def test_native_exceptiongroup(outer_chain, inner_chain) -> None:
+    pytest.importorskip("exceptiongroup")
+    _exceptiongroup_common(outer_chain, inner_chain, native=False)

docs/environment.yml

@@ -1,19 +1,20 b''
 name: ipython_docs
 channels:
  - conda-forge
  - defaults
 dependencies:
   - python=3.10
   - setuptools
   - sphinx>=4.2
   - sphinx_rtd_theme
   - numpy
+  - exceptiongroup
   - testpath
   - matplotlib
   - pip
   - pip:
     - docrepr
     - prompt_toolkit
     - ipykernel
     - stack_data
     - -e ..

setup.cfg

@@ -1,118 +1,118 b''
 [metadata]
 name = ipython
 version = attr: IPython.core.release.__version__
 url = https://ipython.org
 description = IPython: Productive Interactive Computing
 long_description_content_type = text/x-rst
 long_description = file: long_description.rst
 license_file = LICENSE
 project_urls =
     Documentation = https://ipython.readthedocs.io/
     Funding = https://numfocus.org/
     Source = https://github.com/ipython/ipython
     Tracker = https://github.com/ipython/ipython/issues
 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
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
     Topic :: System :: Shells
 
 [options]
 packages = find:
 python_requires = >=3.9
 zip_safe = False
 install_requires =
     appnope; sys_platform == "darwin"
     backcall
     colorama; sys_platform == "win32"
     decorator
-    exceptiongroup; python_version<'3.10'
+    exceptiongroup; python_version<'3.11'
     jedi>=0.16
     matplotlib-inline
     pexpect>4.3; sys_platform != "win32"
     pickleshare
     prompt_toolkit>=3.0.30,<3.1.0,!=3.0.37
     pygments>=2.4.0
     stack_data
     traitlets>=5
     typing_extensions ; python_version<'3.10'
 
 [options.extras_require]
 black =
     black
 doc =
     ipykernel
     setuptools>=18.5
     sphinx>=1.3
     sphinx-rtd-theme
     docrepr
     matplotlib
     stack_data
     pytest<7
     typing_extensions
     exceptiongroup
     %(test)s
 kernel =
     ipykernel
 nbconvert =
     nbconvert
 nbformat =
     nbformat
 notebook =
     ipywidgets
     notebook
 parallel =
     ipyparallel
 qtconsole =
     qtconsole
 terminal =
 test =
     pytest<7.1
     pytest-asyncio
     testpath
 test_extra =
     %(test)s
     curio
     matplotlib!=3.2.0
     nbformat
     numpy>=1.21
     pandas
     trio
 all =
     %(black)s
     %(doc)s
     %(kernel)s
     %(nbconvert)s
     %(nbformat)s
     %(notebook)s
     %(parallel)s
     %(qtconsole)s
     %(terminal)s
     %(test_extra)s
     %(test)s
 
 [options.packages.find]
 exclude =
     setupext
 
 [options.package_data]
 IPython = py.typed
 IPython.core = profile/README*
 IPython.core.tests = *.png, *.jpg, daft_extension/*.py
 IPython.lib.tests = *.wav
 IPython.testing.plugin = *.txt
 
 [velin]
 ignore_patterns =
    IPython/core/tests
    IPython/testing
 
 [tool.black]
 exclude = 'timing\.py'