Update to 4.32.0

- Fixes: rhbz#2406240
This commit is contained in:
Miro Hrončok 2025-11-06 11:29:52 +01:00
commit 91ed59fa8e
3 changed files with 30 additions and 33 deletions

View file

@ -1,4 +1,4 @@
From 276688b3d884787663a1832990025c3402770961 Mon Sep 17 00:00:00 2001
From 42a461b71597e85e7902571348786aa4ab848cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Fri, 28 Mar 2025 09:44:24 +0100
Subject: [PATCH] Fix tests
@ -9,37 +9,37 @@ Content-Transfer-Encoding: 8bit
Co-Authored-By: Lumir Balhar <lbalhar@redhat.com>
Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
---
pyproject.toml | 10 +---------
src/tox/pytest.py | 16 +++-------------
tests/test_provision.py | 11 ++++-------
.../package/test_python_package_util.py | 10 ++++++++--
4 files changed, 16 insertions(+), 31 deletions(-)
pyproject.toml | 10 +---------
src/tox/pytest.py | 14 ++------------
tests/test_provision.py | 11 ++++-------
.../package/test_python_package_util.py | 10 ++++++++--
4 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index a7323bf..ed9b315 100644
index 6920d19..53326bc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -77,11 +77,6 @@ dev = [
@@ -76,11 +76,6 @@ dev = [
]
test = [
"build[virtualenv]>=1.2.2.post1",
"build[virtualenv]>=1.3",
- "covdefaults>=2.3",
- "coverage>=7.9.2",
- "coverage>=7.10.7",
- "detect-test-pollution>=1.2",
- "devpi-process>=1.0.2",
- "diff-cover>=9.6",
- "diff-cover>=9.7.1",
"distlib>=0.4",
"flaky>=3.8.1",
"hatch-vcs>=0.5",
@@ -89,7 +84,6 @@ test = [
"pdm-backend",
"psutil>=7",
"pytest>=8.4.1",
- "pytest-cov>=6.2.1",
"pytest-mock>=3.14.1",
@@ -88,7 +83,6 @@ test = [
"pdm-backend>=2.4.5",
"psutil>=7.1",
"pytest>=8.4.2",
- "pytest-cov>=7",
"pytest-mock>=3.15.1",
"pytest-xdist>=3.8",
"re-assert>=1.1",
@@ -203,6 +197,7 @@ filterwarnings = [
@@ -201,6 +195,7 @@ filterwarnings = [
"error",
"ignore:unclosed database in <sqlite3.Connection object at:ResourceWarning",
"ignore:unclosed file <_io.TextIOWrapper:ResourceWarning",
@ -47,7 +47,7 @@ index a7323bf..ed9b315 100644
]
tmp_path_retention_policy = "failed"
@@ -224,9 +219,6 @@ report.omit = [
@@ -222,9 +217,6 @@ report.omit = [
"tests/type_check/*",
]
run.parallel = true
@ -58,10 +58,10 @@ index a7323bf..ed9b315 100644
[tool.towncrier]
name = "tox"
diff --git a/src/tox/pytest.py b/src/tox/pytest.py
index bfdc7e6..9a02df3 100644
index 31b3e6f..c358313 100644
--- a/src/tox/pytest.py
+++ b/src/tox/pytest.py
@@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c
@@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Protocol, cast
import pytest
from _pytest.fixtures import SubRequest # noqa: PLC2701
@ -69,21 +69,18 @@ index bfdc7e6..9a02df3 100644
from virtualenv.info import fs_supports_symlink
import tox.run
@@ -284,10 +283,10 @@ class ToxProject:
@@ -285,8 +284,8 @@ class ToxProject:
m.setattr(sys, "argv", [sys.executable, "-m", "tox", *list(args)])
m.setenv("VIRTUALENV_SYMLINK_APP_DATA", "1")
m.setenv("VIRTUALENV_SYMLINKS", "1")
- m.setenv("VIRTUALENV_PIP", "embed")
+ m.setenv("VIRTUALENV_PIP", "bundle")
if sys.version_info[:2] < (3, 9):
- m.setenv("VIRTUALENV_WHEEL", "embed")
- m.setenv("VIRTUALENV_SETUPTOOLS", "embed")
+ m.setenv("VIRTUALENV_WHEEL", "bundle")
+ m.setenv("VIRTUALENV_PIP", "bundle")
+ m.setenv("VIRTUALENV_SETUPTOOLS", "bundle")
try:
tox_run(args)
except SystemExit as exception:
@@ -480,15 +479,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None
@@ -479,15 +478,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None
monkeypatch.setenv("PIP_TIMEOUT", str(2))
@ -100,10 +97,10 @@ index bfdc7e6..9a02df3 100644
def _invalid_index_fake_port() -> int:
with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as socket_handler:
diff --git a/tests/test_provision.py b/tests/test_provision.py
index 2cde4f6..0baba46 100644
index d1b6b2d..022e340 100644
--- a/tests/test_provision.py
+++ b/tests/test_provision.py
@@ -124,15 +124,13 @@ def _use_pypi_index(pypi_index: Index, monkeypatch: MonkeyPatch) -> None:
@@ -126,15 +126,13 @@ def _use_pypi_index(pypi_index: Index, monkeypatch: MonkeyPatch) -> None:
@pytest.fixture
@ -123,7 +120,7 @@ index 2cde4f6..0baba46 100644
def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None:
@@ -181,7 +179,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -
@@ -183,7 +181,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -
@pytest.mark.integration
@ -162,5 +159,5 @@ index 3802147..7f64d90 100644
for left, right in zip_longest(result, exp):
assert isinstance(right, Requirement)
--
2.51.0
2.51.1

View file

@ -20,7 +20,7 @@
%undefine _py3_shebang_s
Name: python-tox
Version: 4.30.3
Version: 4.32.0
Release: %autorelease
Summary: Virtualenv-based automation of test activities

View file

@ -1 +1 @@
SHA512 (tox-4.30.3.tar.gz) = c4ef909b7e369844042f26ae4c492ec4c78cd0efe11af80f36159304166cd6e77b75b8191de0e78870f414c921230402bccdfda5ceeb56e4194abc66f076f720
SHA512 (tox-4.32.0.tar.gz) = eabe1ef037f3b44947dd13e11528cd702762d6b38cf87ae7675643d7f09b2b3ddd9761a395713e95f286ffc44d77495998f68ed2f0491910f64308fb15f726ff