Update to 4.12.1

This commit is contained in:
Miro Hrončok 2024-01-25 16:28:30 +01:00
commit e8c52fe381
3 changed files with 23 additions and 22 deletions

View file

@ -1,4 +1,4 @@
From c23f636eef39220989fcfde7aed6a505aaca993c Mon Sep 17 00:00:00 2001
From d12ada760ddff3cbd77a04577561d32b4d36560a Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Tue, 10 Jan 2023 08:34:25 +0100
Subject: [PATCH] fix tests
@ -10,40 +10,40 @@ Subject: [PATCH] fix tests
3 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 9bdfbca..51c6980 100644
index 7cb8de3..fe0b77d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,9 +72,6 @@ optional-dependencies.docs = [
]
optional-dependencies.testing = [
"build[virtualenv]>=0.10",
"build[virtualenv]>=1.0.3",
- "covdefaults>=2.3",
- "detect-test-pollution>=1.1.1",
- "detect-test-pollution>=1.2",
- "devpi-process>=1",
"diff-cover>=7.7",
"distlib>=0.3.7",
"diff-cover>=8.0.2",
"distlib>=0.3.8",
"flaky>=3.7",
@@ -82,7 +79,6 @@ optional-dependencies.testing = [
"hatchling>=1.18",
"psutil>=5.9.5",
"pytest>=7.4",
"hatchling>=1.21",
"psutil>=5.9.7",
"pytest>=7.4.4",
- "pytest-cov>=4.1",
"pytest-mock>=3.11.1",
"pytest-xdist>=3.3.1",
"pytest-mock>=3.12",
"pytest-xdist>=3.5",
"re-assert>=1.1",
@@ -148,7 +144,6 @@ paths.source = [
@@ -160,7 +156,6 @@ paths.source = [
report.fail_under = 88
report.omit = ["src/tox/config/cli/for_docs.py", "tests/execute/local_subprocess/bad_process.py", "tests/type_check/*"]
run.parallel = true
-run.plugins = ["covdefaults"]
[tool.mypy]
python_version = "3.11"
[tool.towncrier]
name = "tox"
diff --git a/src/tox/pytest.py b/src/tox/pytest.py
index d7243bd..0e14e5d 100644
index 0563404..6cd08b8 100644
--- a/src/tox/pytest.py
+++ b/src/tox/pytest.py
@@ -16,7 +16,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c
@@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c
import pytest
from _pytest.fixtures import SubRequest
@ -51,7 +51,7 @@ index d7243bd..0e14e5d 100644
from virtualenv.info import fs_supports_symlink
import tox.run
@@ -276,9 +275,9 @@ class ToxProject:
@@ -277,9 +276,9 @@ class ToxProject:
m.setattr(sys, "argv", [sys.executable, "-m", "tox", *list(args)])
m.setenv("VIRTUALENV_SYMLINK_APP_DATA", "1")
m.setenv("VIRTUALENV_SYMLINKS", "1")
@ -81,7 +81,7 @@ index d7243bd..0e14e5d 100644
def _invalid_index_fake_port() -> int: # noqa: PT005
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 f9275fb..ddf8607 100644
index 3b5bd19..442ac84 100644
--- a/tests/test_provision.py
+++ b/tests/test_provision.py
@@ -92,21 +92,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path]
@ -117,5 +117,5 @@ index f9275fb..ddf8607 100644
ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform"
proj = tox_project({"tox.ini": ini})
--
2.40.1
2.43.0

View file

@ -19,7 +19,7 @@
%undefine _py3_shebang_s
Name: python-tox
Version: 4.11.1
Version: 4.12.1
Release: %autorelease
Summary: Virtualenv-based automation of test activities
@ -104,7 +104,7 @@ Recommends: python3-devel
# Upstream updates dependencies too aggressively
# see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356
sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|diff-cover|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|pluggy|distlib|cachetools)>=.*/"\1",/g' \
sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|diff-cover|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|pluggy|distlib|cachetools|build\[virtualenv\])>=.*/"\1",/g' \
-e "s/'(time-machine)>=[^;']+/'\1/" \
-e 's/"(virtualenv)>=.*/"\1>=20",/g' \
-e 's/"(hatchling)>=.*/"\1>=1.13",/g' \
@ -148,6 +148,7 @@ k="${k-}${k+ and }not test_call_as_exe"
# unknown reason, reported: https://github.com/tox-dev/tox/issues/2841
k="${k-}${k+ and }not test_local_execute_basic_pass_show_on_standard_newline_flush"
k="${k-}${k+ and }not test_local_execute_write_a_lot"
k="${k-}${k+ and }not test_run_installpkg_targz"
%endif
%pytest -v -n auto -k "${k-}" --run-integration

View file

@ -1 +1 @@
SHA512 (tox-4.11.1.tar.gz) = 8dc99f98a72ece1cae60e9a0d99fe44b66bd6d9fe6f2d45b0f4e7ab10a5e4a65049cced4b212fe8bfe34ded65b8e4b76d642e5c014d385d2d2cd7f87d8cf6816
SHA512 (tox-4.12.1.tar.gz) = 217fbc2933999fcc5d080d97521cd01b7d9a35d4f1542cc58bcc2ff86d07884caa43fd42b09e5064cbad1334e4df9cd717c48c70041c9cf856b0beb22e1ea8a7