Skip to content

Commit 901b800

Browse files
authored
Merge pull request #3217 from python-trio/autodeps/bump_from_a78b5d
Bump dependencies from commit a78b5d
2 parents a78b5da + 59b8755 commit 901b800

File tree

8 files changed

+51
-31
lines changed

8 files changed

+51
-31
lines changed

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repos:
2424
hooks:
2525
- id: black
2626
- repo: https://github.com/astral-sh/ruff-pre-commit
27-
rev: v0.9.7
27+
rev: v0.9.9
2828
hooks:
2929
- id: ruff
3030
types: [file]
@@ -38,15 +38,15 @@ repos:
3838
# tomli needed on 3.10. tomllib is available in stdlib on 3.11+
3939
- tomli
4040
- repo: https://github.com/crate-ci/typos
41-
rev: v1.29.9
41+
rev: typos-dict-v0.12.6
4242
hooks:
4343
- id: typos
4444
- repo: https://github.com/sphinx-contrib/sphinx-lint
4545
rev: v1.0.0
4646
hooks:
4747
- id: sphinx-lint
4848
- repo: https://github.com/woodruffw/zizmor-pre-commit
49-
rev: v1.3.1
49+
rev: v1.4.1
5050
hooks:
5151
- id: zizmor
5252
- repo: local
@@ -59,7 +59,7 @@ repos:
5959
additional_dependencies: ["astor", "attrs", "black", "ruff"]
6060
files: ^src\/trio\/_core\/(_run|(_i(o_(common|epoll|kqueue|windows)|nstrumentation)))\.py$
6161
- repo: https://github.com/astral-sh/uv-pre-commit
62-
rev: 0.6.2
62+
rev: 0.6.3
6363
hooks:
6464
# Compile requirements
6565
- id: pip-compile

docs-requirements.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,4 @@ exceptiongroup >= 1.0.0rc9
2323
immutables >= 0.6
2424

2525
# types used in annotations
26-
# TODO: fix support for importing typing-extensions
27-
pyOpenSSL < 25.0.0
26+
pyOpenSSL

docs-requirements.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ attrs==25.1.0
88
# outcome
99
babel==2.17.0
1010
# via sphinx
11-
beautifulsoup4==4.12.3
11+
beautifulsoup4==4.13.3
1212
# via sphinx-codeautolink
1313
certifi==2025.1.31
1414
# via requests
@@ -55,10 +55,12 @@ pycparser==2.22 ; os_name == 'nt' or platform_python_implementation != 'PyPy'
5555
# via cffi
5656
pygments==2.19.1
5757
# via sphinx
58-
pyopenssl==24.3.0
58+
pyopenssl==25.0.0
5959
# via -r docs-requirements.in
6060
requests==2.32.3
6161
# via sphinx
62+
roman-numerals-py==3.1.0
63+
# via sphinx
6264
sniffio==1.3.1
6365
# via -r docs-requirements.in
6466
snowballstemmer==2.2.0
@@ -67,15 +69,15 @@ sortedcontainers==2.4.0
6769
# via -r docs-requirements.in
6870
soupsieve==2.6
6971
# via beautifulsoup4
70-
sphinx==8.1.3
72+
sphinx==8.2.1
7173
# via
7274
# -r docs-requirements.in
7375
# sphinx-codeautolink
7476
# sphinx-hoverxref
7577
# sphinx-rtd-theme
7678
# sphinxcontrib-jquery
7779
# sphinxcontrib-trio
78-
sphinx-codeautolink==0.16.2
80+
sphinx-codeautolink==0.17.1
7981
# via -r docs-requirements.in
8082
sphinx-hoverxref==1.4.2
8183
# via -r docs-requirements.in
@@ -102,5 +104,9 @@ sphinxcontrib-trio==1.1.2
102104
# via -r docs-requirements.in
103105
towncrier==24.8.0
104106
# via -r docs-requirements.in
107+
typing-extensions==4.12.2
108+
# via
109+
# beautifulsoup4
110+
# pyopenssl
105111
urllib3==2.3.0
106112
# via requests

docs/source/conf.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
from pathlib import Path
2626
from typing import TYPE_CHECKING, cast
2727

28+
from sphinx.util.inventory import _InventoryItem
29+
2830
if TYPE_CHECKING:
2931
from sphinx.application import Sphinx
3032
from sphinx.util.typing import Inventory
@@ -266,11 +268,11 @@ def add_mapping(
266268
assert isinstance(inventory, dict)
267269
inventory = cast("Inventory", inventory)
268270

269-
inventory[f"py:{reftype}"][f"{target}"] = (
270-
"Python",
271-
version,
272-
f"https://docs.python.org/{url_version}/library/{library}.html/{obj}",
273-
"-",
271+
inventory[f"py:{reftype}"][f"{target}"] = _InventoryItem(
272+
project_name="Python",
273+
project_version=version,
274+
uri=f"https://docs.python.org/{url_version}/library/{library}.html/{obj}",
275+
display_name="-",
274276
)
275277

276278
# This has been removed in Py3.12, so add a link to the 3.11 version with deprecation warnings.

docs/source/contributing.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ format all our code to a standard style. While you're editing code you
318318
can be as sloppy as you like about whitespace; and then before you commit,
319319
just run:
320320

321-
.. code-block::
321+
.. code-block:: text
322322
323323
pip install -U pre-commit
324324
pre-commit
@@ -332,14 +332,14 @@ nicely formatted. (black doesn't reformat comments or docstrings.)
332332
If you would like, you can even have pre-commit run before you commit by
333333
running:
334334

335-
.. code-block::
335+
.. code-block:: text
336336
337337
pre-commit install
338338
339339
and now pre-commit will run before git commits. You can uninstall the
340340
pre-commit hook at any time by running:
341341

342-
.. code-block::
342+
.. code-block:: text
343343
344344
pre-commit uninstall
345345
@@ -349,7 +349,7 @@ you can can add ``# fmt: off`` and ``# fmt: on`` comments.
349349

350350
If you want to see what changes black will make, you can use:
351351

352-
.. code-block::
352+
.. code-block:: text
353353
354354
black --diff trio
355355
@@ -433,7 +433,7 @@ file to install all of the required packages (possibly using a
433433
virtualenv). After that, build the docs using ``make html`` in the
434434
docs directory. The whole process might look something like this:
435435

436-
.. code-block::
436+
.. code-block:: text
437437
438438
cd path/to/project/checkout/
439439
pip install -r docs-requirements.txt

src/trio/testing/_memory_streams.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,15 @@ def put_eof(self) -> None:
280280
self._incoming.close()
281281

282282

283+
# TODO: investigate why this is necessary for the docs
284+
MemorySendStream.__module__ = MemorySendStream.__module__.replace(
285+
"._memory_streams", ""
286+
)
287+
MemoryReceiveStream.__module__ = MemoryReceiveStream.__module__.replace(
288+
"._memory_streams", ""
289+
)
290+
291+
283292
def memory_stream_pump(
284293
memory_send_stream: MemorySendStream,
285294
memory_receive_stream: MemoryReceiveStream,

src/trio/testing/_raises_group.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ class Matcher(AbstractMatcher[MatchE]):
270270
271271
Examples::
272272
273-
with RaisesGroups(Matcher(ValueError, match="string"))
273+
with RaisesGroups(Matcher(ValueError, match="string")):
274274
...
275275
with RaisesGroups(Matcher(check=lambda x: x.args == (3, "hello"))):
276276
...
@@ -326,7 +326,7 @@ def matches(
326326
327327
Examples::
328328
329-
assert Matcher(ValueError).matches(my_exception):
329+
assert Matcher(ValueError).matches(my_exception)
330330
# is equivalent to
331331
assert isinstance(my_exception, ValueError)
332332
@@ -336,7 +336,7 @@ def matches(
336336
assert Matcher(SyntaxError, match="foo").matches(excinfo.value.__cause__)
337337
# above line is equivalent to
338338
assert isinstance(excinfo.value.__cause__, SyntaxError)
339-
assert re.search("foo", str(excinfo.value.__cause__)
339+
assert re.search("foo", str(excinfo.value.__cause__))
340340
341341
"""
342342
if not self._check_type(exception):
@@ -549,7 +549,7 @@ def __init__(
549549
)
550550
self.allow_unwrapped = allow_unwrapped
551551
self.flatten_subgroups: bool = flatten_subgroups
552-
self.is_baseexceptiongroup = False
552+
self.is_baseexceptiongroup: bool = False
553553

554554
if allow_unwrapped and other_exceptions:
555555
raise ValueError(

test-requirements.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ exceptiongroup==1.2.2 ; python_full_version < '3.11'
5858
# pytest
5959
filelock==3.17.0
6060
# via virtualenv
61-
identify==2.6.7
61+
identify==2.6.8
6262
# via pre-commit
6363
idna==3.10
6464
# via
@@ -71,7 +71,7 @@ importlib-metadata==8.6.1 ; python_full_version < '3.10'
7171
# via sphinx
7272
iniconfig==2.0.0
7373
# via pytest
74-
isort==6.0.0
74+
isort==6.0.1
7575
# via pylint
7676
jedi==0.19.2 ; implementation_name == 'cpython'
7777
# via -r test-requirements.in
@@ -122,15 +122,17 @@ pylint==3.3.4
122122
# via -r test-requirements.in
123123
pyopenssl==25.0.0
124124
# via -r test-requirements.in
125-
pyright==1.1.393
125+
pyright==1.1.395
126126
# via -r test-requirements.in
127127
pytest==8.3.4
128128
# via -r test-requirements.in
129129
pyyaml==6.0.2
130130
# via pre-commit
131131
requests==2.32.3
132132
# via sphinx
133-
ruff==0.9.7
133+
roman-numerals-py==3.1.0 ; python_full_version >= '3.11'
134+
# via sphinx
135+
ruff==0.9.9
134136
# via -r test-requirements.in
135137
sniffio==1.3.1
136138
# via -r test-requirements.in
@@ -140,7 +142,9 @@ sortedcontainers==2.4.0
140142
# via -r test-requirements.in
141143
sphinx==7.4.7 ; python_full_version < '3.10'
142144
# via -r test-requirements.in
143-
sphinx==8.1.3 ; python_full_version >= '3.10'
145+
sphinx==8.1.3 ; python_full_version == '3.10.*'
146+
# via -r test-requirements.in
147+
sphinx==8.2.1 ; python_full_version >= '3.11'
144148
# via -r test-requirements.in
145149
sphinxcontrib-applehelp==2.0.0
146150
# via sphinx
@@ -173,7 +177,7 @@ types-docutils==0.21.0.20241128
173177
# via -r test-requirements.in
174178
types-pyopenssl==24.1.0.20240722
175179
# via -r test-requirements.in
176-
types-setuptools==75.8.0.20250210
180+
types-setuptools==75.8.0.20250225
177181
# via types-cffi
178182
typing-extensions==4.12.2
179183
# via
@@ -186,7 +190,7 @@ typing-extensions==4.12.2
186190
# pyright
187191
urllib3==2.3.0
188192
# via requests
189-
uv==0.6.2
193+
uv==0.6.3
190194
# via -r test-requirements.in
191195
virtualenv==20.29.2
192196
# via pre-commit

0 commit comments

Comments
 (0)