Skip to content

Commit e67dbed

Browse files
committed
merge pytest-xdist/master and resolve conflicts
2 parents d62d632 + 9c24f0f commit e67dbed

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

.github/workflows/deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
path: dist
4040

4141
- name: Publish package to PyPI
42-
uses: pypa/[email protected].1
42+
uses: pypa/[email protected].3
4343
with:
4444
attestations: true
4545

.github/workflows/test.yml

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
- "py311-pytestlatest"
4242
- "py311-pytestmain"
4343
- "py312-pytestlatest"
44+
- "py313-pytestlatest"
4445
- "py310-psutil"
4546
- "py310-setproctitle"
4647

@@ -60,6 +61,8 @@ jobs:
6061
python: "3.11"
6162
- tox_env: "py312-pytestlatest"
6263
python: "3.12"
64+
- tox_env: "py313-pytestlatest"
65+
python: "3.13"
6366
- tox_env: "py310-psutil"
6467
python: "3.10"
6568
- tox_env: "py310-setproctitle"

.pre-commit-config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: "v0.6.5"
3+
rev: "v0.7.0"
44
hooks:
55
- id: ruff
66
args: ["--fix"]
77
- id: ruff-format
88
- repo: https://github.com/asottile/blacken-docs
9-
rev: 1.18.0
9+
rev: 1.19.0
1010
hooks:
1111
- id: blacken-docs
1212
additional_dependencies: [black==23.1.0]
1313
- repo: https://github.com/pre-commit/pre-commit-hooks
14-
rev: v4.6.0
14+
rev: v5.0.0
1515
hooks:
1616
- id: check-yaml
1717
- repo: local
@@ -23,7 +23,7 @@ repos:
2323
language: python
2424
additional_dependencies: [pygments, restructuredtext_lint]
2525
- repo: https://github.com/pre-commit/mirrors-mypy
26-
rev: v1.11.2
26+
rev: v1.12.1
2727
hooks:
2828
- id: mypy
2929
files: ^(src/|testing/)

changelog/1142.feature.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added support for Python 3.13.

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ classifiers = [
3030
"Programming Language :: Python :: 3.10",
3131
"Programming Language :: Python :: 3.11",
3232
"Programming Language :: Python :: 3.12",
33+
"Programming Language :: Python :: 3.13",
3334
]
3435
requires-python = ">=3.8"
3536
dependencies = [

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
33
linting
4-
py{38,39,310,311,312}-pytestlatest
4+
py{38,39,310,311,312,313}-pytestlatest
55
py310-pytestmain
66
py310-psutil
77
py310-setproctitle

0 commit comments

Comments
 (0)