Skip to content

Commit 7347108

Browse files
authored
Upgrade pytest and requests (#65)
1 parent bf5ecdf commit 7347108

6 files changed

Lines changed: 32 additions & 36 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ check-all:
5555
pre-commit run --all-files
5656

5757
test:
58-
pdm run pytest -q -x --ff --nf
58+
env -u PYTHONPATH pdm run pytest -q -x --ff --nf
5959

6060
vtest:
61-
pdm run pytest -vv -x --ff --nf
61+
env -u PYTHONPATH pdm run pytest -vv -x --ff --nf
6262

6363
cov:
6464
rm -rf .coverage

conftest.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,19 @@
66

77
from sybil.parsers.rest import DocTestParser, PythonCodeBlockParser
88

9-
ignore_collect = sum(
10-
(
11-
[str(p.absolute()) for p in Path().glob(pattern)]
12-
for pattern in ["jsonpath/lark_parser.py"]
13-
),
14-
[],
15-
)
9+
ignore_collect = {
10+
p.absolute()
11+
for pattern in ["jsonpath/lark_parser.py"]
12+
for p in Path().glob(pattern)
13+
}
1614

1715

18-
def pytest_ignore_collect(path, config):
16+
def pytest_ignore_collect(collection_path, config):
1917
"""return True to prevent considering this path for collection.
2018
This hook is consulted for all files and directories prior to calling
2119
more specific hooks.
2220
"""
23-
# https://docs.pytest.org/en/5.4.3/reference.html?highlight=pytest_ignore_collect#_pytest.hookspec.pytest_ignore_collect
24-
# noqa: B950
25-
if str(path) in ignore_collect:
21+
if collection_path.absolute() in ignore_collect:
2622
return True
2723

2824
return False

pdm.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ lock = ["-S", "inherit_metadata,no_cross_platform"]
5757

5858
[tool.pdm.dev-dependencies]
5959
docs = ["sphinx~=7.4", "livereload~=2.6", "lark~=1.2", "tornado>=6.3.2"]
60-
test = ["pytest-cov~=5.0", "pytest~=8.0", "pexpect~=4.8", "sybil~=8.0"]
60+
test = ["pytest-cov~=5.0", "pytest~=9.0", "pexpect~=4.8", "sybil~=8.0"]
6161
build_readme = ["pygments~=2.8", "docutils>=0.16"]

scripts/requirements/requirements-dev.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,15 @@ ptyprocess==0.7.0 \
307307
pygments==2.20.0 \
308308
--hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \
309309
--hash=sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176
310-
pytest==8.4.2 \
311-
--hash=sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01 \
312-
--hash=sha256:872f880de3fc3a5bdc88a11b39c9710c3497a547cfa9320bc3c5e62fbf272e79
310+
pytest==9.1.0 \
311+
--hash=sha256:41dd9148c08072446394cefd3d79701701335a9f4cae69ba92e39f6c7f5c061c \
312+
--hash=sha256:8ebb0e7888bdf2bdfc602ec51f8f62d50200af37356c74e503c79a94f5c81f32
313313
pytest-cov==5.0.0 \
314314
--hash=sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652 \
315315
--hash=sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857
316-
requests==2.32.5 \
317-
--hash=sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6 \
318-
--hash=sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf
316+
requests==2.34.2 \
317+
--hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \
318+
--hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed
319319
snowballstemmer==3.0.1 \
320320
--hash=sha256:6cd7b3897da8d6c9ffb968a6781fa6532dce9c3618a4b127d920dab764a19064 \
321321
--hash=sha256:6d5eeeec8e9f84d4d56b847692bacf79bc2c8e90c7f80ca4444ff8b6f2e52895

scripts/requirements/requirements-docs.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ packaging==26.0 \
199199
pygments==2.20.0 \
200200
--hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \
201201
--hash=sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176
202-
requests==2.32.5 \
203-
--hash=sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6 \
204-
--hash=sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf
202+
requests==2.34.2 \
203+
--hash=sha256:2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0 \
204+
--hash=sha256:f288924cae4e29463698d6d60bc6a4da69c89185ad1e0bcc4104f584e960b9ed
205205
snowballstemmer==3.0.1 \
206206
--hash=sha256:6cd7b3897da8d6c9ffb968a6781fa6532dce9c3618a4b127d920dab764a19064 \
207207
--hash=sha256:6d5eeeec8e9f84d4d56b847692bacf79bc2c8e90c7f80ca4444ff8b6f2e52895

0 commit comments

Comments
 (0)