From 5ba74078244a6c903b26eccd4d21c073fce69b2f Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 30 Nov 2023 11:44:22 +0100 Subject: [PATCH] Remove the mentions about Pythran before adding options to meson-python --- scipy.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scipy.spec b/scipy.spec index 59b43ca..b63cfe9 100644 --- a/scipy.spec +++ b/scipy.spec @@ -23,7 +23,7 @@ Summary: Scientific Tools for Python Name: scipy Version: 1.11.3 -Release: 2%{?dist} +Release: 3%{?dist} # BSD-3-Clause -- whole package except: # BSD-2-Clause -- scipy/_lib/_pep440.py @@ -126,6 +126,12 @@ Scipy test files %prep %autosetup -p1 -n %{name}-%{version}%{?rcver} + +# Remove pythran dependency if not explicitly required +%if %{without pythran} +sed -i '/pythran/d' pyproject.toml +%endif + cat >> pyproject.toml << EOF [tool.meson-python.args] @@ -160,11 +166,6 @@ sed -i '/^[[:blank:]]*"scikit-umfpack"/d' pyproject.toml sed -i '/^[[:blank:]]*"pytest-xdist"/d' pyproject.toml %endif -# Remove pythran dependency if not explicitly required -%if %{without pythran} -sed -i '/pythran/d' pyproject.toml -%endif - # Loosen the lower bound on numpy sed -i "/numpy.*python_version=='3.12'/s/1\.26\.0/1\.24\.4/" pyproject.toml @@ -305,6 +306,9 @@ popd %endif %changelog +* Thu Nov 30 2023 Karolina Surma - 1.11.3-3 +- Fix the build without pythran + * Wed Nov 01 2023 Benjamin A. Beasley - 1.11.3-2 - Patch error collecting tests with pytest-xdist