Skip to content

Commit 9949b49

Browse files
committed
Merge branch '3.1.x'
2 parents 7f0fc0a + 3e5b5b2 commit 9949b49

File tree

6 files changed

+22
-66
lines changed

6 files changed

+22
-66
lines changed

requirements/build.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile build.in
66
#
77
build==1.2.1
88
# via -r build.in
9-
importlib-metadata==8.4.0
10-
# via build
119
packaging==24.1
1210
# via build
1311
pyproject-hooks==1.1.0
1412
# via build
15-
tomli==2.0.1
16-
# via build
17-
zipp==3.20.0
18-
# via importlib-metadata

requirements/dev.txt

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile dev.in
66
#
7-
alabaster==0.7.13
7+
alabaster==1.0.0
88
# via sphinx
99
attrs==24.2.0
1010
# via
@@ -32,12 +32,8 @@ colorama==0.4.6
3232
# via tox
3333
distlib==0.3.8
3434
# via virtualenv
35-
docutils==0.20.1
35+
docutils==0.21.2
3636
# via sphinx
37-
exceptiongroup==1.2.2
38-
# via
39-
# pytest
40-
# trio
4137
filelock==3.15.4
4238
# via
4339
# tox
@@ -50,10 +46,6 @@ idna==3.8
5046
# trio
5147
imagesize==1.4.1
5248
# via sphinx
53-
importlib-metadata==8.4.0
54-
# via
55-
# build
56-
# sphinx
5749
iniconfig==2.0.0
5850
# via pytest
5951
jinja2==3.1.4
@@ -90,7 +82,7 @@ pluggy==1.5.0
9082
# via
9183
# pytest
9284
# tox
93-
pre-commit==3.5.0
85+
pre-commit==3.8.0
9486
# via -r dev.in
9587
pygments==2.18.0
9688
# via sphinx
@@ -102,8 +94,6 @@ pyproject-hooks==1.1.0
10294
# pip-tools
10395
pytest==8.3.2
10496
# via -r tests.in
105-
pytz==2024.1
106-
# via babel
10797
pyyaml==6.0.2
10898
# via pre-commit
10999
requests==2.32.3
@@ -114,36 +104,28 @@ snowballstemmer==2.2.0
114104
# via sphinx
115105
sortedcontainers==2.4.0
116106
# via trio
117-
sphinx==7.1.2
107+
sphinx==8.0.2
118108
# via
119109
# -r docs.in
120110
# pallets-sphinx-themes
121111
# sphinx-issues
122112
# sphinxcontrib-log-cabinet
123113
sphinx-issues==4.1.0
124114
# via -r docs.in
125-
sphinxcontrib-applehelp==1.0.4
115+
sphinxcontrib-applehelp==2.0.0
126116
# via sphinx
127-
sphinxcontrib-devhelp==1.0.2
117+
sphinxcontrib-devhelp==2.0.0
128118
# via sphinx
129-
sphinxcontrib-htmlhelp==2.0.1
119+
sphinxcontrib-htmlhelp==2.1.0
130120
# via sphinx
131121
sphinxcontrib-jsmath==1.0.1
132122
# via sphinx
133123
sphinxcontrib-log-cabinet==1.0.1
134124
# via -r docs.in
135-
sphinxcontrib-qthelp==1.0.3
125+
sphinxcontrib-qthelp==2.0.0
136126
# via sphinx
137-
sphinxcontrib-serializinghtml==1.1.5
127+
sphinxcontrib-serializinghtml==2.0.0
138128
# via sphinx
139-
tomli==2.0.1
140-
# via
141-
# build
142-
# mypy
143-
# pip-tools
144-
# pyproject-api
145-
# pytest
146-
# tox
147129
toposort==1.10
148130
# via pip-compile-multi
149131
tox==4.18.0
@@ -160,8 +142,6 @@ virtualenv==20.26.3
160142
# tox
161143
wheel==0.44.0
162144
# via pip-tools
163-
zipp==3.20.0
164-
# via importlib-metadata
165145

166146
# The following packages are considered to be unsafe in a requirements file:
167147
# pip

requirements/docs.txt

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile docs.in
66
#
7-
alabaster==0.7.13
7+
alabaster==1.0.0
88
# via sphinx
99
babel==2.16.0
1010
# via sphinx
1111
certifi==2024.7.4
1212
# via requests
1313
charset-normalizer==3.3.2
1414
# via requests
15-
docutils==0.20.1
15+
docutils==0.21.2
1616
# via sphinx
1717
idna==3.8
1818
# via requests
1919
imagesize==1.4.1
2020
# via sphinx
21-
importlib-metadata==8.4.0
22-
# via sphinx
2321
jinja2==3.1.4
2422
# via sphinx
2523
markupsafe==2.1.5
@@ -32,35 +30,31 @@ pallets-sphinx-themes==2.1.3
3230
# via -r docs.in
3331
pygments==2.18.0
3432
# via sphinx
35-
pytz==2024.1
36-
# via babel
3733
requests==2.32.3
3834
# via sphinx
3935
snowballstemmer==2.2.0
4036
# via sphinx
41-
sphinx==7.1.2
37+
sphinx==8.0.2
4238
# via
4339
# -r docs.in
4440
# pallets-sphinx-themes
4541
# sphinx-issues
4642
# sphinxcontrib-log-cabinet
4743
sphinx-issues==4.1.0
4844
# via -r docs.in
49-
sphinxcontrib-applehelp==1.0.4
45+
sphinxcontrib-applehelp==2.0.0
5046
# via sphinx
51-
sphinxcontrib-devhelp==1.0.2
47+
sphinxcontrib-devhelp==2.0.0
5248
# via sphinx
53-
sphinxcontrib-htmlhelp==2.0.1
49+
sphinxcontrib-htmlhelp==2.1.0
5450
# via sphinx
5551
sphinxcontrib-jsmath==1.0.1
5652
# via sphinx
5753
sphinxcontrib-log-cabinet==1.0.1
5854
# via -r docs.in
59-
sphinxcontrib-qthelp==1.0.3
55+
sphinxcontrib-qthelp==2.0.0
6056
# via sphinx
61-
sphinxcontrib-serializinghtml==1.1.5
57+
sphinxcontrib-serializinghtml==2.0.0
6258
# via sphinx
6359
urllib3==2.2.2
6460
# via requests
65-
zipp==3.20.0
66-
# via importlib-metadata

requirements/tests.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile tests.in
@@ -8,10 +8,6 @@ attrs==24.2.0
88
# via
99
# outcome
1010
# trio
11-
exceptiongroup==1.2.2
12-
# via
13-
# pytest
14-
# trio
1511
idna==3.8
1612
# via trio
1713
iniconfig==2.0.0
@@ -28,7 +24,5 @@ sniffio==1.3.1
2824
# via trio
2925
sortedcontainers==2.4.0
3026
# via trio
31-
tomli==2.0.1
32-
# via pytest
3327
trio==0.26.2
3428
# via -r tests.in

requirements/typing.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile typing.in
@@ -8,7 +8,5 @@ mypy==1.11.1
88
# via -r typing.in
99
mypy-extensions==1.0.0
1010
# via mypy
11-
tomli==2.0.1
12-
# via mypy
1311
typing-extensions==4.12.2
1412
# via mypy

tox.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ use_frozen_constraints = true
1515
deps = -r requirements/tests.txt
1616
commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs}
1717

18-
[testenv:py37,py3.7]
19-
deps = -r requirements/tests37.txt
20-
2118
[testenv:style]
2219
deps = pre-commit
2320
skip_install = true
@@ -43,7 +40,6 @@ skip_install = true
4340
commands = pre-commit autoupdate -j4
4441

4542
[testenv:update-requirements]
46-
base_python = 3.8
4743
labels = update
4844
deps = pip-tools
4945
skip_install = true

0 commit comments

Comments
 (0)