Skip to content

Commit 396f708

Browse files
authored
Merge branch 'main' into main
2 parents a2ede89 + c894fa0 commit 396f708

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
minimum_pre_commit_version: "4.4.0"
22
repos:
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: "v0.14.13"
4+
rev: "v0.14.14"
55
hooks:
66
- id: ruff-check
77
args: ["--fix"]
@@ -68,7 +68,7 @@ repos:
6868
# Manual because passing pyright is a work in progress.
6969
stages: [manual]
7070
- repo: https://github.com/tox-dev/pyproject-fmt
71-
rev: "v2.11.1"
71+
rev: "v2.12.1"
7272
hooks:
7373
- id: pyproject-fmt
7474
# https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version

pyproject.toml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ keywords = [
1616
license = "MIT"
1717
license-files = [ "LICENSE" ]
1818
authors = [
19-
{ name = "Holger Krekel" },
20-
{ name = "Bruno Oliveira" },
21-
{ name = "Ronny Pfannschmidt" },
22-
{ name = "Floris Bruynooghe" },
2319
{ name = "Brianna Laugher" },
20+
{ name = "Bruno Oliveira" },
2421
{ name = "Florian Bruhin" },
22+
{ name = "Floris Bruynooghe" },
23+
{ name = "Holger Krekel" },
2524
{ name = "Others (See AUTHORS)" },
25+
{ name = "Ronny Pfannschmidt" },
2626
]
2727
requires-python = ">=3.10"
2828
classifiers = [
@@ -432,24 +432,6 @@ markers = [
432432
"keep_ci_var",
433433
]
434434

435-
[tool.coverage.run]
436-
include = [
437-
'src/*',
438-
'testing/*',
439-
'*/lib/python*/site-packages/_pytest/*',
440-
'*/lib/python*/site-packages/pytest.py',
441-
'*/pypy*/site-packages/_pytest/*',
442-
'*/pypy*/site-packages/pytest.py',
443-
'*\Lib\site-packages\_pytest\*',
444-
'*\Lib\site-packages\pytest.py',
445-
]
446-
parallel = true
447-
branch = true
448-
patch = [ "subprocess" ]
449-
# The sysmon core (default since Python 3.14) is much slower.
450-
# Perhaps: https://github.com/coveragepy/coveragepy/issues/2082
451-
core = "ctrace"
452-
453435
[tool.coverage.paths]
454436
source = [
455437
'src/',
@@ -474,6 +456,24 @@ exclude_lines = [
474456
'^\s*@pytest\.mark\.xfail',
475457
]
476458

459+
[tool.coverage.run]
460+
include = [
461+
'src/*',
462+
'testing/*',
463+
'*/lib/python*/site-packages/_pytest/*',
464+
'*/lib/python*/site-packages/pytest.py',
465+
'*/pypy*/site-packages/_pytest/*',
466+
'*/pypy*/site-packages/pytest.py',
467+
'*\Lib\site-packages\_pytest\*',
468+
'*\Lib\site-packages\pytest.py',
469+
]
470+
parallel = true
471+
branch = true
472+
patch = [ "subprocess" ]
473+
# The sysmon core (default since Python 3.14) is much slower.
474+
# Perhaps: https://github.com/coveragepy/coveragepy/issues/2082
475+
core = "ctrace"
476+
477477
[tool.towncrier]
478478
package = "pytest"
479479
package_dir = "src"

testing/plugins_integration/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
anyio[trio]==4.12.1
2-
django==6.0.1
2+
django==6.0.2
33
pytest-asyncio==1.3.0
44
pytest-bdd==8.1.0
55
pytest-cov==7.0.0

0 commit comments

Comments
 (0)