Skip to content

python/tox: update to 4.33.0 #25266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndWac merged 1 commit into from
Jan 3, 2026
Merged

python/tox: update to 4.33.0 #25266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/python/tox/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/tox-4.32.0/
/tox-4.33.0/
4 changes: 2 additions & 2 deletions components/python/tox/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ BUILD_STYLE = pyproject
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME = tox
HUMAN_VERSION = 4.32.0
HUMAN_VERSION = 4.33.0
COMPONENT_SUMMARY = tox is a generic virtualenv management and test command line tool
COMPONENT_PROJECT_URL = http://tox.readthedocs.org
COMPONENT_ARCHIVE_HASH = \
sha256:1ad476b5f4d3679455b89a992849ffc3367560bbc7e9495ee8a3963542e7c8ff
sha256:a29244bce3f514f94043e173366aa191c8cf0106ec8ddd18ba53f985acd73cc4
COMPONENT_LICENSE = MIT
COMPONENT_LICENSE_FILE = LICENSE

Expand Down
2 changes: 1 addition & 1 deletion components/python/tox/manifests/sample-manifest.p5m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#

#
# Copyright 2025 <contributor>
# Copyright 2026 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
Expand Down
18 changes: 9 additions & 9 deletions components/python/tox/patches/01-test-no-devpi_process.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
We do not have devpi_process available (yet)

--- tox-4.32.0/pyproject.toml.orig
+++ tox-4.32.0/pyproject.toml
--- tox-4.33.0/pyproject.toml.orig
+++ tox-4.33.0/pyproject.toml
@@ -79,7 +79,6 @@
"covdefaults>=2.3",
"coverage>=7.10.7",
"coverage>=7.13.1",
"detect-test-pollution>=1.2",
- "devpi-process>=1.0.2",
"diff-cover>=9.7.1",
- "devpi-process>=1.1",
"diff-cover>=10.1",
"distlib>=0.4",
"flaky>=3.8.1",
--- tox-4.32.0/src/tox/pytest.py.orig
+++ tox-4.32.0/src/tox/pytest.py
--- tox-4.33.0/src/tox/pytest.py.orig
+++ tox-4.33.0/src/tox/pytest.py
@@ -17,7 +17,6 @@

import pytest
Expand All @@ -36,8 +36,8 @@ We do not have devpi_process available (yet)
def _invalid_index_fake_port() -> int:
with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as socket_handler:
socket_handler.bind(("", 0))
--- tox-4.32.0/tests/test_provision.py.orig
+++ tox-4.32.0/tests/test_provision.py
--- tox-4.33.0/tests/test_provision.py.orig
+++ tox-4.33.0/tests/test_provision.py
@@ -19,7 +19,6 @@
from collections.abc import Callable, Iterator, Sequence

Expand Down
4 changes: 2 additions & 2 deletions components/python/tox/patches/02-tox-pytest-indirectly.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- tox-4.32.0/tox.toml.orig
+++ tox-4.32.0/tox.toml
--- tox-4.33.0/tox.toml.orig
+++ tox-4.33.0/tox.toml
@@ -12,6 +12,8 @@
set_env.COVERAGE_FILECOVERAGE_PROCESS_START = "{tox_root}{/}pyproject.toml"
commands = [
Expand Down
4 changes: 2 additions & 2 deletions components/python/tox/patches/03-tox-cov-proto.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
We test in proto area not in site-packages.

--- tox-4.32.0/tox.toml.orig
+++ tox-4.32.0/tox.toml
--- tox-4.33.0/tox.toml.orig
+++ tox-4.33.0/tox.toml
@@ -24,7 +24,7 @@
"{work_dir}{/}junit.{env_name}.xml",
"--no-cov-on-fail",
Expand Down
4 changes: 2 additions & 2 deletions components/python/tox/patches/04-test-tox-path.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- tox-4.32.0/tests/test_call_modes.py.orig
+++ tox-4.32.0/tests/test_call_modes.py
--- tox-4.33.0/tests/test_call_modes.py.orig
+++ tox-4.33.0/tests/test_call_modes.py
@@ -14,4 +14,4 @@


Expand Down
12 changes: 6 additions & 6 deletions components/python/tox/patches/05-tox-current-env.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- tox-4.32.0/tests/test_version.py.orig
+++ tox-4.32.0/tests/test_version.py
--- tox-4.33.0/tests/test_version.py.orig
+++ tox-4.33.0/tests/test_version.py
@@ -11,11 +11,14 @@

from tox.pytest import ToxProjectCreator
Expand All @@ -15,8 +15,8 @@
def test_version_without_plugin(tox_project: ToxProjectCreator) -> None:
outcome = tox_project({"tox.ini": ""}).run("--version")
outcome.assert_success()
--- tox-4.32.0/tests/config/cli/test_cli_env_var.py.orig
+++ tox-4.32.0/tests/config/cli/test_cli_env_var.py
--- tox-4.33.0/tests/config/cli/test_cli_env_var.py.orig
+++ tox-4.33.0/tests/config/cli/test_cli_env_var.py
@@ -70,6 +70,11 @@
"labels": [],
"skip_env": "",
Expand All @@ -41,8 +41,8 @@
}
assert options.parsed.verbosity == 4
assert options.cmd_handlers == core_handlers
--- tox-4.32.0/tests/config/cli/test_cli_ini.py.orig
+++ tox-4.32.0/tests/config/cli/test_cli_ini.py
--- tox-4.33.0/tests/config/cli/test_cli_ini.py.orig
+++ tox-4.33.0/tests/config/cli/test_cli_ini.py
@@ -59,6 +59,11 @@
"exit_and_dump_after": 0,
"skip_env": "",
Expand Down
12 changes: 6 additions & 6 deletions components/python/tox/patches/06-no-diff-cover.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
We cannot compare against origin/main branch because we build from sdist, not git.

--- tox-4.32.0/tox.toml.orig
+++ tox-4.32.0/tox.toml
--- tox-4.33.0/tox.toml.orig
+++ tox-4.33.0/tox.toml
@@ -41,12 +41,6 @@
"--run-integration",
] },
Expand All @@ -15,13 +15,13 @@ We cannot compare against origin/main branch because we build from sdist, not gi
]

[env.fix]
--- tox-4.32.0/pyproject.toml.orig
+++ tox-4.32.0/pyproject.toml
--- tox-4.33.0/pyproject.toml.orig
+++ tox-4.33.0/pyproject.toml
@@ -79,7 +79,6 @@
"covdefaults>=2.3",
"coverage>=7.10.7",
"coverage>=7.13.1",
"detect-test-pollution>=1.2",
- "diff-cover>=9.7.1",
- "diff-cover>=10.1",
"distlib>=0.4",
"flaky>=3.8.1",
"hatch-vcs>=0.5",
12 changes: 6 additions & 6 deletions components/python/tox/patches/07-setup.cfg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
https://github.com/tox-dev/tox/issues/3602

--- tox-4.32.0/src/tox/config/source/discover.py.orig
+++ tox-4.32.0/src/tox/config/source/discover.py
--- tox-4.33.0/src/tox/config/source/discover.py.orig
+++ tox-4.33.0/src/tox/config/source/discover.py
@@ -19,10 +19,10 @@

SOURCE_TYPES: tuple[type[Source], ...] = (
Expand All @@ -14,8 +14,8 @@ https://github.com/tox-dev/tox/issues/3602
)


--- tox-4.32.0/tests/config/source/test_discover.py.orig
+++ tox-4.32.0/tests/config/source/test_discover.py
--- tox-4.33.0/tests/config/source/test_discover.py.orig
+++ tox-4.33.0/tests/config/source/test_discover.py
@@ -10,7 +10,7 @@

def out_no_src(path: Path) -> str:
Expand All @@ -25,8 +25,8 @@ https://github.com/tox-dev/tox/issues/3602
f"\ndefault environments:\npy -> [no description]\n"
)

--- tox-4.32.0/tests/session/cmd/test_legacy.py.orig
+++ tox-4.32.0/tests/session/cmd/test_legacy.py
--- tox-4.33.0/tests/session/cmd/test_legacy.py.orig
+++ tox-4.33.0/tests/session/cmd/test_legacy.py
@@ -66,7 +66,7 @@
outcome = project.run("le", "-l")
outcome.assert_success()
Expand Down