Skip to content

Commit ab49d09

Browse files
webknjazwebknjaz
committed
Merge branch 'maintenance/pip-tools-constraint-lockfiles'
PR #707
2 parents 30663d1 + c12af91 commit ab49d09

38 files changed

+1335
-1370
lines changed

‎.coveragerc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ _site-packages-to-src-mapping =
1313

1414
[report]
1515
# `fail_under` is set here temporarily until it can be dropped:
16-
fail_under = 73
16+
fail_under = 72
1717
skip_covered = true
1818
skip_empty = true
1919
show_missing = true

‎cheroot/test/test_server.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import os
44
import queue
55
import socket
6+
import sys
67
import tempfile
78
import threading
89
import types
@@ -27,6 +28,7 @@
2728

2829

2930
IS_SLOW_ENV = IS_MACOS or IS_WINDOWS
31+
PY38_OR_LOWER = sys.version_info[:2] <= (3, 8)
3032

3133

3234
unix_only_sock_test = pytest.mark.skipif(
@@ -44,6 +46,11 @@
4446
@pytest.fixture(params=('abstract', 'file'))
4547
def unix_sock_file(request):
4648
"""Check that bound UNIX socket address is stored in server."""
49+
if PY38_OR_LOWER:
50+
# FIXME: This can be dropped together with Python 3.8.
51+
# FIXME: It's coming from `trustme < 1.2.0` as newer versions
52+
# FIXME: fixed the compatibility but dropped Python 3.8 support.
53+
pytest.skip('`requests-unixsocket` is defunct under Python 3.8')
4754
name = 'unix_{request.param}_sock'.format(**locals())
4855
return request.getfixturevalue(name)
4956

‎cheroot/test/test_ssl.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,24 @@
5555
OpenSSL.SSL.SSLEAY_VERSION,
5656
).startswith(b'OpenSSL 1.0.')
5757
PY310_PLUS = sys.version_info[:2] >= (3, 10)
58+
PY38_OR_LOWER = sys.version_info[:2] <= (3, 8)
59+
60+
if PY38_OR_LOWER:
61+
# FIXME: This can be dropped together with Python 3.8.
62+
# FIXME: It's coming from `trustme < 1.2.0` as newer versions
63+
# FIXME: fixed the compatibility but dropped Python 3.8 support.
64+
pytestmark = [
65+
pytest.mark.filterwarnings(
66+
r'ignore:Passing pyOpenSSL PKey objects is deprecated\. '
67+
r'You should use a cryptography private key instead\.:'
68+
'DeprecationWarning:OpenSSL.SSL',
69+
),
70+
pytest.mark.filterwarnings(
71+
r'ignore:Passing pyOpenSSL X509 objects is deprecated\. '
72+
r'You should use a cryptography\.x509\.Certificate instead\.:'
73+
'DeprecationWarning:OpenSSL.SSL',
74+
),
75+
]
5876

5977

6078
_stdlib_to_openssl_verify = {

‎requirements/tox-py310-cp310-darwin-arm64.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tests.in

‎requirements/tox-py310-cp310-darwin-arm64.txt‎

Lines changed: 68 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,89 +2,89 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --output-file=requirements/tox-py310-cp310-darwin-x86_64.txt --strip-extras pyproject.toml requirements/tox-py310-cp310-darwin-x86_64.in
5+
# pip-compile --allow-unsafe --cert=None --client-cert=None --index-url=None --output-file=requirements/tox-py310-cp310-darwin-arm64.txt --pip-args=None --strip-extras pyproject.toml requirements/tox-py310-cp310-darwin-arm64.in
66
#
77
autocommand==2.2.2
88
# via jaraco-text
9-
backports-tarfile==1.1.1
9+
backports-tarfile==1.2.0
1010
# via jaraco-context
11-
certifi==2024.2.2
11+
certifi==2025.8.3
1212
# via requests
13-
cffi==1.16.0
13+
cffi==2.0.0
1414
# via cryptography
1515
chardet==5.2.0
1616
# via requests
17-
charset-normalizer==3.3.2
17+
charset-normalizer==3.4.3
1818
# via requests
1919
colorama==0.4.6
2020
# via pytest-watch
21-
coverage==7.5.0
21+
coverage==7.10.6
2222
# via
23-
# -r requirements/tox-py310-cp310-darwin-x86_64.in
23+
# -r requirements/tox-py310-cp310-darwin-arm64.in
2424
# pytest-cov
25-
cryptography==42.0.5
25+
cryptography==46.0.1
2626
# via
2727
# pyopenssl
2828
# trustme
2929
docopt==0.6.2
3030
# via pytest-watch
31-
exceptiongroup==1.2.1
31+
exceptiongroup==1.3.0
3232
# via pytest
3333
execnet==2.1.1
3434
# via pytest-xdist
35-
idna==3.7
35+
idna==3.10
3636
# via
3737
# requests
3838
# trustme
39-
inflect==7.2.1
40-
# via jaraco-text
41-
iniconfig==2.0.0
39+
iniconfig==2.1.0
4240
# via pytest
43-
jaraco-context==5.3.0
41+
jaraco-context==6.0.1
4442
# via
45-
# -r requirements/tox-py310-cp310-darwin-x86_64.in
43+
# -r requirements/tox-py310-cp310-darwin-arm64.in
4644
# jaraco-text
47-
jaraco-functools==4.0.1
45+
jaraco-functools==4.3.0
4846
# via
4947
# cheroot (pyproject.toml)
5048
# jaraco-text
5149
# tempora
52-
jaraco-text==3.12.0
53-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
54-
markdown-it-py==3.0.0
50+
jaraco-text==4.0.0
51+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
52+
markdown-it-py==4.0.0
5553
# via rich
5654
mdurl==0.1.2
5755
# via markdown-it-py
58-
more-itertools==10.2.0
56+
more-itertools==10.8.0
5957
# via
6058
# cheroot (pyproject.toml)
61-
# inflect
6259
# jaraco-functools
6360
# jaraco-text
64-
packaging==24.0
61+
packaging==25.0
6562
# via
6663
# pytest
6764
# pytest-rerunfailures
68-
# pytest-sugar
69-
pluggy==1.5.0
70-
# via pytest
71-
portend==3.2.0
72-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
65+
pluggy==1.6.0
66+
# via
67+
# pytest
68+
# pytest-cov
69+
portend==3.2.1
70+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
7371
pprintpp==0.4.0
7472
# via pytest-clarity
7573
py==1.11.0
7674
# via pypytools
77-
pycparser==2.22
75+
pycparser==2.23
7876
# via cffi
79-
pygments==2.17.2
80-
# via rich
81-
pyopenssl==24.1.0 ; implementation_name != "pypy"
82-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
77+
pygments==2.19.2
78+
# via
79+
# pytest
80+
# rich
81+
pyopenssl==25.3.0 ; implementation_name != "pypy"
82+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
8383
pypytools==0.6.2
84-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
85-
pytest==8.2.0
84+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
85+
pytest==8.4.2
8686
# via
87-
# -r requirements/tox-py310-cp310-darwin-x86_64.in
87+
# -r requirements/tox-py310-cp310-darwin-arm64.in
8888
# pytest-clarity
8989
# pytest-cov
9090
# pytest-mock
@@ -93,51 +93,52 @@ pytest==8.2.0
9393
# pytest-watch
9494
# pytest-xdist
9595
pytest-clarity==1.0.1
96-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
97-
pytest-cov==5.0.0
98-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
99-
pytest-mock==3.14.0
100-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
101-
pytest-rerunfailures==14.0
102-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
103-
pytest-sugar==1.0.0
104-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
96+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
97+
pytest-cov==7.0.0
98+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
99+
pytest-mock==3.15.1
100+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
101+
pytest-rerunfailures==16.0.1
102+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
103+
pytest-sugar==1.1.1
104+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
105105
pytest-watch==4.2.0
106-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
107-
pytest-xdist==3.6.1
108-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
109-
pytz==2024.1
106+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
107+
pytest-xdist==3.8.0
108+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
109+
python-dateutil==2.9.0.post0
110110
# via tempora
111-
requests==2.31.0
111+
requests==2.32.5
112112
# via
113-
# -r requirements/tox-py310-cp310-darwin-x86_64.in
113+
# -r requirements/tox-py310-cp310-darwin-arm64.in
114114
# requests-toolbelt
115115
# requests-unixsocket
116116
requests-toolbelt==1.0.0
117-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
118-
requests-unixsocket==0.3.0
119-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
120-
rich==13.7.1
117+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
118+
requests-unixsocket==0.4.1
119+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
120+
rich==14.1.0
121121
# via pytest-clarity
122-
tempora==5.5.1
122+
six==1.17.0
123+
# via python-dateutil
124+
tempora==5.8.1
123125
# via portend
124-
termcolor==2.4.0
126+
termcolor==3.1.0
125127
# via pytest-sugar
126-
tomli==2.0.1
128+
tomli==2.2.1
127129
# via
128130
# coverage
129131
# pytest
130-
trustme==1.1.0
131-
# via -r requirements/tox-py310-cp310-darwin-x86_64.in
132-
typeguard==4.2.1
133-
# via inflect
134-
typing-extensions==4.11.0
132+
trustme==1.2.1
133+
# via -r requirements/tox-py310-cp310-darwin-arm64.in
134+
typing-extensions==4.15.0
135135
# via
136-
# inflect
137-
# typeguard
138-
urllib3==1.26.18
136+
# cryptography
137+
# exceptiongroup
138+
# pyopenssl
139+
urllib3==1.26.20
139140
# via
140-
# -r requirements/tox-py310-cp310-darwin-x86_64.in
141+
# -r requirements/tox-py310-cp310-darwin-arm64.in
141142
# requests
142-
watchdog==4.0.0
143+
watchdog==6.0.0
143144
# via pytest-watch

0 commit comments

Comments
 (0)