[packages/python3-build] Actually project wants us to use rerunfailures and not flaky. Unfortunately flaky conflicts with rer
arekm
arekm at pld-linux.org
Sat Feb 8 16:32:00 CET 2025
commit 14e548a6293fff6d6c55b793a22e23cc51215f3c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Feb 8 15:56:22 2025 +0100
Actually project wants us to use rerunfailures and not flaky. Unfortunately flaky conflicts with rerunfailures.
python3-build.spec | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/python3-build.spec b/python3-build.spec
index 6173bcb..d94a543 100644
--- a/python3-build.spec
+++ b/python3-build.spec
@@ -16,7 +16,9 @@ BuildRequires: python3-build
BuildRequires: python3-installer
BuildRequires: python3-modules >= 1:3.2
%if %{with tests}
-BuildRequires: python3-flaky
+BuildRequires: python3-pytest-rerunfailures
+# rerunfailures conflicts with flaky
+BuildConflicts: python3-flaky
%endif
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 2.044
@@ -46,16 +48,12 @@ Dokumentacja API modułu Pythona %{module}.
%prep
%setup -q -n %{module}-%{version}
-# reruns seem to come from pytest-rerunfailures but that's incompatible with flaky,
-# see https://github.com/pytest-dev/pytest-rerunfailures/blob/15.0/README.rst
-sed -i -e 's#reruns=5#max_runs=5#g' tests/test_main.py
-
%build
%py3_build_pyproject
%if %{with tests}
PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
-PYTEST_PLUGINS=flaky,pytest_mock \
+PYTEST_PLUGINS=rerunfailures,pytest_mock \
%{__python3} -m pytest tests
%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python3-build.git/commitdiff/14e548a6293fff6d6c55b793a22e23cc51215f3c
More information about the pld-cvs-commit
mailing list