Skip to content

Commit fc8c199

Browse files
github-actions[bot]A5rockspre-commit-ci[bot]
authored
Bump dependencies from commit 4f905c (#3374)
* Dependency updates * Try working around package installation issues * Actually, mypy uses 3.10 * Update ci.yml for tox changes * Update things for Sphinx version we use * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Oops * More changes... * ... --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: A5rocks <git@helvetica.moe> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 4f905c2 commit fc8c199

6 files changed

Lines changed: 48 additions & 26 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,21 @@ jobs:
281281
cache: pip
282282
cache-dependency-path: test-requirements.txt
283283
allow-prereleases: true
284+
- name: Setup minimum Python version
285+
if: matrix.check_formatting == '1'
286+
uses: actions/setup-python@v6
287+
with:
288+
python-version: '3.10'
289+
cache: pip
290+
cache-dependency-path: test-requirements.txt
291+
allow-prereleases: true
284292
- name: Check Formatting
285293
if: matrix.check_formatting == '1'
286294
run:
287295
python -m pip install tox &&
288296
tox -m check
289297
- name: Install python3-apport
298+
if: matrix.check_formatting == '0'
290299
run: |
291300
sudo apt update
292301
sudo apt install -q python3-apport

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ repos:
3838
# tomli needed on 3.10. tomllib is available in stdlib on 3.11+
3939
- tomli
4040
- repo: https://github.com/adhtruong/mirrors-typos
41-
rev: v1.40.0
41+
rev: v1.40.1
4242
hooks:
4343
- id: typos
4444
- repo: https://github.com/sphinx-contrib/sphinx-lint
@@ -73,7 +73,7 @@ repos:
7373
additional_dependencies: ["pyyaml"]
7474
files: ^(test-requirements\.txt)|(\.pre-commit-config\.yaml)$
7575
- repo: https://github.com/astral-sh/uv-pre-commit
76-
rev: 0.9.18
76+
rev: 0.9.21
7777
hooks:
7878
# Compile requirements
7979
- id: pip-compile

docs-requirements.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,17 @@ pyopenssl==25.3.0
5959
# via -r docs-requirements.in
6060
requests==2.32.5
6161
# via sphinx
62-
roman-numerals-py==3.1.0
62+
roman-numerals==4.1.0
63+
# via roman-numerals-py
64+
roman-numerals-py==4.1.0
6365
# via sphinx
6466
sniffio==1.3.1
6567
# via -r docs-requirements.in
6668
snowballstemmer==3.0.1
6769
# via sphinx
6870
sortedcontainers==2.4.0
6971
# via -r docs-requirements.in
70-
soupsieve==2.8
72+
soupsieve==2.8.1
7173
# via beautifulsoup4
7274
sphinx==8.2.3
7375
# via
@@ -105,5 +107,5 @@ typing-extensions==4.15.0
105107
# beautifulsoup4
106108
# exceptiongroup
107109
# pyopenssl
108-
urllib3==2.6.1
110+
urllib3==2.6.2
109111
# via requests

docs/source/conf.py

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

28-
from sphinx.util.inventory import _InventoryItem
28+
if sys.version_info >= (3, 11):
29+
from sphinx.util.inventory import _InventoryItem
30+
2931
from sphinx.util.logging import getLogger
3032

3133
if TYPE_CHECKING:
@@ -280,12 +282,20 @@ def add_mapping(
280282
assert isinstance(inventory, dict)
281283
inventory = cast("Inventory", inventory)
282284

283-
inventory[f"py:{reftype}"][f"{target}"] = _InventoryItem(
284-
project_name="Python",
285-
project_version=version,
286-
uri=f"https://docs.python.org/{url_version}/library/{library}.html/{obj}",
287-
display_name="-",
288-
)
285+
if sys.version_info >= (3, 11):
286+
inventory[f"py:{reftype}"][f"{target}"] = _InventoryItem(
287+
project_name="Python",
288+
project_version=version,
289+
uri=f"https://docs.python.org/{url_version}/library/{library}.html/{obj}",
290+
display_name="-",
291+
)
292+
else:
293+
inventory[f"py:{reftype}"][f"{target}"] = (
294+
"Python",
295+
version,
296+
f"https://docs.python.org/{url_version}/library/{library}.html/{obj}",
297+
"-",
298+
)
289299

290300
# This has been removed in Py3.12, so add a link to the 3.11 version with deprecation warnings.
291301
add_mapping("method", "pathlib", "Path.link_to", "3.11")

test-requirements.txt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ colorama==0.4.6 ; sys_platform == 'win32'
3636
# pylint
3737
# pytest
3838
# sphinx
39-
coverage==7.13.0
39+
coverage==7.13.1
4040
# via -r test-requirements.in
4141
cryptography==46.0.3
4242
# via
@@ -50,13 +50,13 @@ distlib==0.4.0
5050
# via virtualenv
5151
docutils==0.21.2 ; python_full_version < '3.11'
5252
# via sphinx
53-
docutils==0.22.3 ; python_full_version >= '3.11'
53+
docutils==0.22.4 ; python_full_version >= '3.11'
5454
# via sphinx
5555
exceptiongroup==1.3.1 ; python_full_version < '3.11'
5656
# via
5757
# -r test-requirements.in
5858
# pytest
59-
filelock==3.20.0
59+
filelock==3.20.1
6060
# via virtualenv
6161
identify==2.6.15
6262
# via pre-commit
@@ -75,20 +75,20 @@ jedi==0.19.2 ; implementation_name == 'cpython'
7575
# via -r test-requirements.in
7676
jinja2==3.1.6
7777
# via sphinx
78-
librt==0.7.3 ; implementation_name == 'cpython'
78+
librt==0.7.5 ; implementation_name == 'cpython' and platform_python_implementation != 'PyPy'
7979
# via mypy
8080
markupsafe==3.0.3
8181
# via jinja2
8282
mccabe==0.7.0
8383
# via pylint
84-
mypy==1.19.0 ; implementation_name == 'cpython'
84+
mypy==1.19.1 ; implementation_name == 'cpython'
8585
# via -r test-requirements.in
8686
mypy-extensions==1.1.0
8787
# via
8888
# -r test-requirements.in
8989
# black
9090
# mypy
91-
nodeenv==1.9.1
91+
nodeenv==1.10.0
9292
# via
9393
# pre-commit
9494
# pyright
@@ -112,7 +112,7 @@ platformdirs==4.5.1
112112
# virtualenv
113113
pluggy==1.6.0
114114
# via pytest
115-
pre-commit==4.5.0
115+
pre-commit==4.5.1
116116
# via -r test-requirements.in
117117
pycparser==2.23 ; (implementation_name != 'PyPy' and os_name == 'nt') or (implementation_name != 'PyPy' and platform_python_implementation != 'PyPy')
118118
# via cffi
@@ -134,7 +134,7 @@ pyyaml==6.0.3
134134
# via pre-commit
135135
requests==2.32.5
136136
# via sphinx
137-
roman-numerals==3.1.0 ; python_full_version >= '3.11'
137+
roman-numerals==4.1.0 ; python_full_version >= '3.11'
138138
# via sphinx
139139
ruff==0.14.10
140140
# via -r test-requirements.in
@@ -146,7 +146,9 @@ sortedcontainers==2.4.0
146146
# via -r test-requirements.in
147147
sphinx==8.1.3 ; python_full_version < '3.11'
148148
# via -r test-requirements.in
149-
sphinx==9.0.4 ; python_full_version >= '3.11'
149+
sphinx==9.0.4 ; python_full_version == '3.11.*'
150+
# via -r test-requirements.in
151+
sphinx==9.1.0 ; python_full_version >= '3.12'
150152
# via -r test-requirements.in
151153
sphinxcontrib-applehelp==2.0.0
152154
# via sphinx
@@ -181,7 +183,7 @@ types-pyopenssl==24.1.0.20240722
181183
# via -r test-requirements.in
182184
types-pyyaml==6.0.12.20250915
183185
# via -r test-requirements.in
184-
types-setuptools==80.9.0.20250822
186+
types-setuptools==80.9.0.20251223
185187
# via types-cffi
186188
typing-extensions==4.15.0
187189
# via
@@ -194,9 +196,9 @@ typing-extensions==4.15.0
194196
# pyopenssl
195197
# pyright
196198
# virtualenv
197-
urllib3==2.6.1
199+
urllib3==2.6.2
198200
# via requests
199-
uv==0.9.18
201+
uv==0.9.21
200202
# via -r test-requirements.in
201203
virtualenv==20.35.4
202204
# via pre-commit

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,12 @@ base_python = 3.13
9797
commands =
9898
pre-commit run pip-compile --all-files
9999

100-
# TODO: allow specifying e.g. typing-3.11 to run with --python[-]version=3.11
101100
[testenv:typing]
102101
description = "Run type checks: mypy on all platforms, and pyright on `src/trio[/_core]/_tests/type_tests/`."
103102
deps =
104103
-r test-requirements.txt
105104
exceptiongroup
106-
base_python = 3.13
105+
base_python = 3.10
107106
set_env =
108107
PYRIGHT_PYTHON_IGNORE_WARNINGS=1
109108
commands =

0 commit comments

Comments
 (0)