Skip to content

Commit 608f7af

Browse files
authored
Merge branch 'main' into feat/stderr-color
2 parents 7b28341 + eca61ed commit 608f7af

File tree

20 files changed

+706
-37
lines changed

20 files changed

+706
-37
lines changed

.github/workflows/check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
fetch-depth: 0
3737
- name: Install the latest version of uv
38-
uses: astral-sh/setup-uv@v4
38+
uses: astral-sh/setup-uv@v5
3939
with:
4040
enable-cache: true
4141
cache-dependency-glob: "pyproject.toml"
@@ -76,7 +76,7 @@ jobs:
7676
with:
7777
fetch-depth: 0
7878
- name: Install the latest version of uv
79-
uses: astral-sh/setup-uv@v4
79+
uses: astral-sh/setup-uv@v5
8080
with:
8181
enable-cache: true
8282
cache-dependency-glob: "pyproject.toml"

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
fetch-depth: 0
1616
- name: Install the latest version of uv
17-
uses: astral-sh/setup-uv@v4
17+
uses: astral-sh/setup-uv@v5
1818
with:
1919
enable-cache: true
2020
cache-dependency-glob: "pyproject.toml"

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ repos:
55
- id: end-of-file-fixer
66
- id: trailing-whitespace
77
- repo: https://github.com/python-jsonschema/check-jsonschema
8-
rev: 0.29.4
8+
rev: 0.31.0
99
hooks:
1010
- id: check-github-workflows
1111
args: ["--verbose"]
@@ -23,7 +23,7 @@ repos:
2323
hooks:
2424
- id: validate-pyproject
2525
- repo: https://github.com/astral-sh/ruff-pre-commit
26-
rev: "v0.8.0"
26+
rev: "v0.9.2"
2727
hooks:
2828
- id: ruff-format
2929
- id: ruff
@@ -38,7 +38,7 @@ repos:
3838
hooks:
3939
- id: rst-backticks
4040
- repo: https://github.com/rbubley/mirrors-prettier
41-
rev: "v3.3.3"
41+
rev: "v3.4.2"
4242
hooks:
4343
- id: prettier
4444
- repo: local

docs/_static/img/tox.svg

Lines changed: 12 additions & 2 deletions
Loading

docs/changelog.rst

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,30 @@ Release History
44

55
.. towncrier release notes start
66
7+
v4.24.0 (2025-01-21)
8+
--------------------
9+
10+
Features - 4.24.0
11+
~~~~~~~~~~~~~~~~~
12+
- Add a ``schema`` command to produce a JSON Schema for tox and the current plugins.
13+
14+
- by :user:`henryiii` (:issue:`3446`)
15+
16+
Bugfixes - 4.24.0
17+
~~~~~~~~~~~~~~~~~
18+
- Log exception name when subprocess execution produces one.
19+
20+
- by :user:`ssbarnea` (:issue:`3450`)
21+
22+
Improved Documentation - 4.24.0
23+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
24+
- Fix typo in ``docs/config.rst`` from ``{}`` to ``{:}``.
25+
26+
- by :user:`wooshaun53` (:issue:`3424`)
27+
- Pass ``NIX_LD`` and ``NIX_LD_LIBRARY_PATH`` variables by default in ``pass_env`` to make generic binaries work under Nix/NixOS.
28+
29+
- by :user:`albertodonato` (:issue:`3425`)
30+
731
v4.23.2 (2024-10-22)
832
--------------------
933

docs/changelog/3424.doc.rst

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

docs/changelog/3425.doc.rst

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

docs/changelog/3450.bugfix.rst

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

src/tox/config/sets.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import sys
44
from abc import ABC, abstractmethod
55
from pathlib import Path
6-
from typing import TYPE_CHECKING, Any, Callable, Iterator, Mapping, Sequence, TypeVar, cast
6+
from typing import TYPE_CHECKING, Any, Callable, Generator, Iterator, Mapping, Sequence, TypeVar, cast
77

88
from .of_type import ConfigConstantDefinition, ConfigDefinition, ConfigDynamicDefinition, ConfigLoadArgs
99
from .set_env import SetEnv
@@ -33,6 +33,12 @@ def __init__(self, conf: Config, section: Section, env_name: str | None) -> None
3333
self._final = False
3434
self.register_config()
3535

36+
def get_configs(self) -> Generator[ConfigDefinition[Any], None, None]:
37+
""":return: a mapping of config keys to their definitions"""
38+
for k, v in self._defined.items():
39+
if k == next(iter(v.keys)):
40+
yield v
41+
3642
@abstractmethod
3743
def register_config(self) -> None:
3844
raise NotImplementedError

src/tox/execute/request.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ def shell_cmd(self) -> str:
5959
exe = str(Path(self.cmd[0]).relative_to(self.cwd))
6060
except ValueError:
6161
exe = self.cmd[0]
62-
_cmd = [exe]
63-
_cmd.extend(self.cmd[1:])
64-
return shell_cmd(_cmd)
62+
cmd = [exe]
63+
cmd.extend(self.cmd[1:])
64+
return shell_cmd(cmd)
6565

6666
def __repr__(self) -> str:
6767
return f"{self.__class__.__name__}(cmd={self.cmd!r}, cwd={self.cwd!r}, env=..., stdin={self.stdin!r})"

0 commit comments

Comments
 (0)