diff --git a/.readthedocs.yml b/.readthedocs.yml index 056c691..fd19713 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -15,4 +15,5 @@ python: - requirements: docs-requirements.txt sphinx: + configuration: docs/source/conf.py fail_on_warning: true diff --git a/docs/source/conf.py b/docs/source/conf.py index c68b4bc..f400d4b 100755 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -132,7 +132,6 @@ # html_theme_options. import sphinx_rtd_theme html_theme = 'sphinx_rtd_theme' -html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/test-requirements.txt b/test-requirements.txt index bb660a4..05552c5 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,4 +3,4 @@ pytest-cov pytest-trio outcome pytest-timeout -trio >= 0.25.0 +trio >= 0.26.0 diff --git a/tests/test_misc.py b/tests/test_misc.py index 8724149..0c178eb 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -333,9 +333,9 @@ def collect_exceptions(loop, context): ) expected = [ValueError("hi"), ValueError("lo"), KeyError(), IndexError()] await raise_in_aio_loop(expected[0]) - with trio.testing.RaisesGroup(SystemExit, strict=False): + with trio.testing.RaisesGroup(SystemExit, flatten_subgroups=True): await raise_in_aio_loop(SystemExit(0)) - with trio.testing.RaisesGroup(SystemExit, strict=False) as result: + with trio.testing.RaisesGroup(SystemExit, flatten_subgroups=True) as result: await raise_in_aio_loop(BaseExceptionGroup("", [expected[1], SystemExit()])) assert len(result.value.exceptions) == 1 diff --git a/tests/test_trio_asyncio.py b/tests/test_trio_asyncio.py index 045d0c1..dfbb7e5 100644 --- a/tests/test_trio_asyncio.py +++ b/tests/test_trio_asyncio.py @@ -124,7 +124,7 @@ async def test_cancel_loop_with_tasks(autojump_clock, shield, body_raises): if body_raises: catcher = trio.testing.RaisesGroup( - trio.testing.Matcher(ValueError, match="hi"), strict=False + trio.testing.Matcher(ValueError, match="hi"), flatten_subgroups=True ) else: catcher = contextlib.nullcontext()