Skip to content

Commit befc88e

Browse files
committed
Merge remote-tracking branch 'origin/main' into pytest_skip_paramspec
2 parents b6d97c1 + 9e9633d commit befc88e

113 files changed

Lines changed: 1107 additions & 542 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@ exclude_lines =
2929

3030
^\s*if TYPE_CHECKING:
3131
^\s*@overload( |$)
32+
^\s*def .+: \.\.\.$
3233

3334
^\s*@pytest\.mark\.xfail

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
"windows-py311",
6262
"windows-py312",
6363
"windows-py313",
64+
"windows-py314",
6465

6566
"ubuntu-py39-lsof-numpy-pexpect",
6667
"ubuntu-py39-pluggy",
@@ -70,12 +71,14 @@ jobs:
7071
"ubuntu-py311",
7172
"ubuntu-py312",
7273
"ubuntu-py313-pexpect",
74+
"ubuntu-py314",
7375
"ubuntu-pypy3-xdist",
7476

7577
"macos-py39",
7678
"macos-py310",
7779
"macos-py312",
7880
"macos-py313",
81+
"macos-py314",
7982

8083
"doctesting",
8184
"plugins",

.pre-commit-config.yaml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: "v0.11.11"
3+
rev: "v0.11.12"
44
hooks:
55
- id: ruff
66
args: ["--fix"]
@@ -12,7 +12,7 @@ repos:
1212
- id: end-of-file-fixer
1313
- id: check-yaml
1414
- repo: https://github.com/woodruffw/zizmor-pre-commit
15-
rev: v1.8.0
15+
rev: v1.9.0
1616
hooks:
1717
- id: zizmor
1818
- repo: https://github.com/adamchainz/blacken-docs
@@ -32,7 +32,7 @@ repos:
3232
hooks:
3333
- id: python-use-type-annotations
3434
- repo: https://github.com/pre-commit/mirrors-mypy
35-
rev: v1.15.0
35+
rev: v1.16.0
3636
hooks:
3737
- id: mypy
3838
files: ^(src/|testing/|scripts/)
@@ -47,6 +47,24 @@ repos:
4747
# for mypy running on python>=3.11 since exceptiongroup is only a dependency
4848
# on <3.11
4949
- exceptiongroup>=1.0.0rc8
50+
- repo: https://github.com/RobertCraigie/pyright-python
51+
rev: v1.1.401
52+
hooks:
53+
- id: pyright
54+
files: ^(src/|scripts/)
55+
additional_dependencies:
56+
- iniconfig>=1.1.0
57+
- attrs>=19.2.0
58+
- pluggy>=1.5.0
59+
- packaging
60+
- tomli
61+
- types-setuptools
62+
- types-tabulate
63+
# for mypy running on python>=3.11 since exceptiongroup is only a dependency
64+
# on <3.11
65+
- exceptiongroup>=1.0.0rc8
66+
# Manual because passing pyright is a work in progress.
67+
stages: [manual]
5068
- repo: https://github.com/tox-dev/pyproject-fmt
5169
rev: "v2.6.0"
5270
hooks:

RELEASING.rst

Lines changed: 1 addition & 3 deletions

changelog/10224.improvement.rst

Lines changed: 0 additions & 18 deletions
This file was deleted.

changelog/10404.bugfix.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

changelog/10839.deprecation.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog/11067.bugfix.rst

Lines changed: 0 additions & 3 deletions
This file was deleted.

changelog/11118.improvement.rst

Lines changed: 0 additions & 3 deletions
This file was deleted.

changelog/11372.breaking.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)