Skip to content

Commit c8e7b2d

Browse files
authored
Merge branch 'tox-dev:main' into main
2 parents bf3adc2 + 5f07ba8 commit c8e7b2d

File tree

8 files changed

+12
-10
lines changed

8 files changed

+12
-10
lines changed

.github/workflows/check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
py:
26+
- "3.14"
2627
- "3.13"
2728
- "3.12"
2829
- "3.11"
2930
- "3.10"
3031
- "3.9"
31-
- "3.8"
3232
os:
3333
- ubuntu-latest
3434
- windows-latest

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repos:
2323
hooks:
2424
- id: validate-pyproject
2525
- repo: https://github.com/astral-sh/ruff-pre-commit
26-
rev: "v0.11.7"
26+
rev: "v0.11.9"
2727
hooks:
2828
- id: ruff-format
2929
- id: ruff

docs/changelog/3523.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix ``TypeError`` for ``HelpFormatter`` with Python 3.14

docs/changelog/3527.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Drop support for EOL Python 3.8.

docs/installation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Installation
44
As tool
55
--------
66

7-
:pypi:`tox` is a CLI tool that needs a Python interpreter (version 3.7 or higher) to run. We recommend either
7+
:pypi:`tox` is a CLI tool that needs a Python interpreter (version 3.9 or higher) to run. We recommend either
88
:pypi:`pipx` or :pypi:`uv` to install tox into an isolated environment. This has the added benefit that later you'll
99
be able to upgrade tox without affecting other parts of the system. We provide method for ``pip`` too here but we
1010
discourage that path if you can:
@@ -77,7 +77,7 @@ Python and OS Compatibility
7777

7878
tox works with the following Python interpreter implementations:
7979

80-
- `CPython <https://www.python.org/>`_ versions 3.8, 3.9, 3.10, 3.11, 3.12, 3.13
80+
- `CPython <https://www.python.org/>`_ versions 3.9, 3.10, 3.11, 3.12, 3.13
8181

8282
This means tox works on the latest patch version of each of these minor versions. Previous patch versions are supported
8383
on a best effort approach.

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ maintainers = [
2626
authors = [
2727
{ name = "Bernát Gábor", email = "[email protected]" },
2828
]
29-
requires-python = ">=3.8"
29+
requires-python = ">=3.9"
3030
classifiers = [
3131
"Development Status :: 5 - Production/Stable",
3232
"Framework :: tox",
@@ -36,12 +36,12 @@ classifiers = [
3636
"Operating System :: Microsoft :: Windows",
3737
"Operating System :: POSIX",
3838
"Programming Language :: Python :: 3 :: Only",
39-
"Programming Language :: Python :: 3.8",
4039
"Programming Language :: Python :: 3.9",
4140
"Programming Language :: Python :: 3.10",
4241
"Programming Language :: Python :: 3.11",
4342
"Programming Language :: Python :: 3.12",
4443
"Programming Language :: Python :: 3.13",
44+
"Programming Language :: Python :: 3.14",
4545
"Topic :: Software Development :: Libraries",
4646
"Topic :: Software Development :: Testing",
4747
"Topic :: Utilities",
@@ -195,7 +195,7 @@ ignore-words = "ignore-words.txt"
195195
count = true
196196

197197
[tool.pyproject-fmt]
198-
max_supported_python = "3.13"
198+
max_supported_python = "3.14"
199199

200200
[tool.pytest.ini_options]
201201
testpaths = [

src/tox/config/cli/parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ def parse_args( # type: ignore[override] # avoid defining all overloads
9595
class HelpFormatter(ArgumentDefaultsHelpFormatter):
9696
"""A help formatter that provides the default value and the source it comes from."""
9797

98-
def __init__(self, prog: str) -> None:
99-
super().__init__(prog, max_help_position=30, width=240)
98+
def __init__(self, prog: str, **kwargs: Any) -> None:
99+
super().__init__(prog, max_help_position=30, width=240, **kwargs)
100100

101101
def _get_help_string(self, action: Action) -> str | None:
102102
text: str = super()._get_help_string(action) or ""

tox.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
requires = ["tox>=4.24.1"]
2-
env_list = ["fix", "3.13", "3.12", "3.11", "3.10", "3.9", "3.8", "cov", "type", "docs", "pkg_meta"]
2+
env_list = ["fix", "3.14", "3.13", "3.12", "3.11", "3.10", "3.9", "cov", "type", "docs", "pkg_meta"]
33
skip_missing_interpreters = true
44

55
[env_run_base]

0 commit comments

Comments
 (0)