From d3cbcc3c4666d5462f081c9d8561a44ce1aef93f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 23 May 2023 19:32:34 -0400 Subject: [PATCH] Avoid pytest-xdist dependency in RHEL builds python-pytest-xdist is unwanted in RHEL due to its dependencies. --- scipy.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scipy.spec b/scipy.spec index d0d1828..ae89c85 100644 --- a/scipy.spec +++ b/scipy.spec @@ -25,7 +25,7 @@ Summary: Scientific Tools for Python Name: scipy Version: 1.10.1 -Release: 2%{?dist} +Release: 3%{?dist} # BSD -- whole package except: # Boost -- scipy/special/cephes/scipy_iv.c @@ -46,7 +46,9 @@ BuildRequires: python3-pooch BuildRequires: python3-setuptools BuildRequires: python3-Cython BuildRequires: python3-pytest +%if ! 0%{?rhel} BuildRequires: python3-pytest-xdist +%endif BuildRequires: python3-pytest-timeout %if %{with pythran} @@ -209,7 +211,7 @@ not test_resiliency_random[TestCSC-test_sum_dtype]'" %endif pushd %{buildroot}/%{python3_sitearch} -%{pytest} --timeout=${TIMEOUT} scipy --numprocesses=auto +%{pytest} --timeout=${TIMEOUT} scipy %{?!rhel:--numprocesses=auto} # Remove test remnants rm -rf gram{A,B} popd @@ -226,6 +228,9 @@ popd %endif %changelog +* Tue May 23 2023 Yaakov Selkowitz - 1.10.1-3 +- Avoid pytest-xdist dependency in RHEL builds + * Wed Mar 15 2023 Pavel Šimovec - 1.10.1-2 - Remove workaround for linking issue on x86_64 - resolves: #2068530