Require exceptiongroup unconditionally for tests

Author: agronholm

test-requirements.in

@@ -7,6 +7,7 @@ trustme               # for the ssl tests
 pylint                # for pylint finding all symbols tests
 jedi                  # for jedi code completion tests
 cryptography>=36.0.0  # 35.0.0 is transitive but fails
+exceptiongroup        # for catch()
 
 # Tools
 black; implementation_name == "cpython"

test-requirements.txt

@@ -32,6 +32,8 @@ cryptography==36.0.1
     #   trustme
 decorator==5.1.0
     # via ipython
+exceptiongroup==1.0.0rc1
+    # via -r test-requirements.in
 flake8==4.0.1
     # via -r test-requirements.in
 idna==3.3

trio/_core/tests/test_run.py

@@ -16,6 +16,7 @@
 import outcome
 import sniffio
 import pytest
+from exceptiongroup import catch
 
 from .tutil import (
     slow,
@@ -38,7 +39,7 @@
 )
 
 if sys.version_info < (3, 11):
-    from exceptiongroup import BaseExceptionGroup, ExceptionGroup, catch
+    from exceptiongroup import BaseExceptionGroup, ExceptionGroup
 
 
 # slightly different from _timeouts.sleep_forever because it returns the value