diff --git a/fix-tests.patch b/fix-tests.patch index b901b9d..332089a 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From 2c5dce5c027de2662d81944f1ba129d8a860b0a7 Mon Sep 17 00:00:00 2001 +From 1ade3df7eaefad792a2a519c0f3cc3a8f28a5829 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -10,12 +10,22 @@ Subject: [PATCH] fix tests 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 50142c5..66f8b5a 100644 +index 74219b1..6cd2da8 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -74,17 +74,12 @@ optional-dependencies.docs = [ +@@ -167,9 +167,6 @@ report.omit = [ + "tests/type_check/*", ] - optional-dependencies.testing = [ + run.parallel = true +-run.plugins = [ +- "covdefaults", +-] + + [tool.towncrier] + name = "tox" +@@ -229,17 +226,12 @@ release = [ + ] + test = [ "build[virtualenv]>=1.2.2", - "covdefaults>=2.3", - "detect-test-pollution>=1.2", @@ -31,18 +41,8 @@ index 50142c5..66f8b5a 100644 "pytest-mock>=3.14", "pytest-xdist>=3.6.1", "re-assert>=1.1", -@@ -192,9 +187,6 @@ report.omit = [ - "tests/type_check/*", - ] - run.parallel = true --run.plugins = [ -- "covdefaults", --] - - [tool.towncrier] - name = "tox" diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index 13072fd..80bf266 100644 +index ca42a5b..183e2f4 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 @@ -120,5 +120,5 @@ index 5b2b652..7657c2e 100644 ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" proj = tox_project({"tox.ini": ini}) -- -2.46.2 +2.47.0 diff --git a/python-tox.spec b/python-tox.spec index d6a9671..ca7ac85 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.21.2 +Version: 4.23.2 Release: %autorelease Summary: Virtualenv-based automation of test activities @@ -37,7 +37,8 @@ Patch: fix-tests.patch BuildArch: noarch BuildRequires: python3-devel -BuildRequires: pyproject-rpm-macros +# for dependency-groups support: +BuildRequires: pyproject-rpm-macros >= 1.16 %if %{with tests} BuildRequires: /usr/bin/gcc @@ -106,7 +107,7 @@ sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|pyproject-api|pytest|pyte %generate_buildrequires export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" -%pyproject_buildrequires -r %{?with_tests:-x testing} +%pyproject_buildrequires -r %{?with_tests:-g test} %build diff --git a/sources b/sources index 3cb37a9..96691d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.21.2.tar.gz) = a2a363ecaa88ac459e147471c1dca7152e21f77f38253b484a15fa908ea8b0e758761e8c2c475bb6bd374a636cb10004c7c2fb6c61fe3718b2b1c09569d0f08d +SHA512 (tox-4.23.2.tar.gz) = 5008964ebed3c94a6ad5f0985150c7bf73fd3996b91171b16323d195bf0288102aac0dc38848bd4c63e5c5678ab1a82c170579139eda97132a4555eb11d381a0