diff --git a/.gitignore b/.gitignore index 3acee5a..9f943ed 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ scipy-0.7.2.tar.gz /scipy-1.10.0.tar.gz /scipy-1.10.1.tar.gz /scipy-1.11.1.tar.gz +/scipy-1.11.3.tar.gz diff --git a/3c89445b6439f3ce7bffc4cf11c6407c39faedc5.patch b/3c89445b6439f3ce7bffc4cf11c6407c39faedc5.patch deleted file mode 100644 index 87b3c3f..0000000 --- a/3c89445b6439f3ce7bffc4cf11c6407c39faedc5.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 3c89445b6439f3ce7bffc4cf11c6407c39faedc5 Mon Sep 17 00:00:00 2001 -From: Matus Valo -Date: Thu, 6 Jul 2023 16:55:25 +0200 -Subject: [PATCH] BLD: copy `cython_optimize.pxd` to build dir (#18810) - -Closes gh-18792 - -[skip cirrus] [skip circle] - ---------- - -Co-authored-by: Ralf Gommers ---- - scipy/optimize/cython_optimize.pxd | 2 +- - scipy/optimize/cython_optimize/meson.build | 1 + - scipy/optimize/meson.build | 8 +++++++- - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/scipy/optimize/cython_optimize.pxd b/scipy/optimize/cython_optimize.pxd -index d5a0bdd758e0..d35f8da68b34 100644 ---- a/scipy/optimize/cython_optimize.pxd -+++ b/scipy/optimize/cython_optimize.pxd -@@ -7,5 +7,5 @@ - # support. Changing it causes an ABI forward-compatibility break - # (gh-11793), so we currently leave it as is (no further cimport - # statements should be used in this file). --from .cython_optimize._zeros cimport ( -+from scipy.optimize.cython_optimize._zeros cimport ( - brentq, brenth, ridder, bisect, zeros_full_output) -diff --git a/scipy/optimize/cython_optimize/meson.build b/scipy/optimize/cython_optimize/meson.build -index 359ea8418ba3..ee8def39b4d3 100644 ---- a/scipy/optimize/cython_optimize/meson.build -+++ b/scipy/optimize/cython_optimize/meson.build -@@ -17,6 +17,7 @@ cy_opt_gen = generator(cython, - arguments : cython_args, - output : '@BASENAME@.c', - depends : [_cython_tree, -+ cython_optimize_pxd, - _dummy_init_optimize, - _dummy_init_cyoptimize]) - -diff --git a/scipy/optimize/meson.build b/scipy/optimize/meson.build -index 26458b05cd70..4c5ab798316b 100644 ---- a/scipy/optimize/meson.build -+++ b/scipy/optimize/meson.build -@@ -206,10 +206,16 @@ endif - - _dummy_init_optimize = fs.copyfile('__init__.py') - -+# Copying this .pxd file is only needed because of a Cython bug, see -+# discussion on SciPy PR gh-18810. -+cython_optimize_pxd = [ -+ fs.copyfile('cython_optimize.pxd'), -+] -+ - opt_gen = generator(cython, - arguments : cython_args, - output : '@BASENAME@.c', -- depends : [_cython_tree, cython_blas_pxd, _dummy_init_optimize]) -+ depends : [_cython_tree, cython_blas_pxd, cython_optimize_pxd, _dummy_init_optimize]) - - _bglu_dense_c = opt_gen.process('_bglu_dense.pyx') - diff --git a/scipy.spec b/scipy.spec index 5a1fc11..9eadaf1 100644 --- a/scipy.spec +++ b/scipy.spec @@ -24,7 +24,7 @@ Summary: Scientific Tools for Python Name: scipy -Version: 1.11.1 +Version: 1.11.3 Release: 1%{?dist} # BSD -- whole package except: @@ -34,9 +34,6 @@ License: BSD and Boost and Public Domain Url: http://www.scipy.org/scipylib/index.html Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{version}.tar.gz -# Fix build failure with Cython 3 when scipy is already installed -Patch: https://github.com/scipy/scipy/commit/3c89445b6439f3ce7bffc4cf11c6407c39faedc5.patch - BuildRequires: fftw-devel, suitesparse-devel BuildRequires: %{blaslib}-devel BuildRequires: gcc-gfortran, swig, gcc-c++ @@ -118,10 +115,17 @@ library_dirs = %{_libdir} EOF # Docs won't build unless the .dat files are specified here -sed -i 's/metadata = dict(/metadata = dict(package_data={"": ["*.dat"]},/' setup.py +sed -i 's/metadata = dict(/metadata = dict(package_data={"": ["*.dat"]},/' _setup.py rm $(grep -rl '/\* Generated by Cython') PKG-INFO +# numpy no longer contains a copy of distutils +for f in $(grep -Frl numpy.distutils); do + sed -i.orig 's/numpy\.\(distutils\)/\1/g' $f + touch -r $f.orig $f + rm $f.orig +done + %build export SCIPY_USE_PYTHRAN=0%{?with_pythran} @@ -134,7 +138,7 @@ for PY in %{python3_version}; do FFLAGS="$RPM_OPT_FLAGS -fPIC" \ %endif LDFLAGS="%{__global_ldflags}" \ - %{_bindir}/python$PY setup.py config_fc \ + %{_bindir}/python$PY _setup.py config_fc \ --fcompiler=gnu95 --noarch \ build @@ -228,7 +232,7 @@ pushd %{buildroot}/%{python3_sitearch} %{pytest} --timeout=${TIMEOUT} scipy %{?!rhel:--numprocesses=auto} # Remove test remnants rm -rf gram{A,B} -rm -rf scipy/.pytest_cache +rm -rf .pytest_cache popd %files -n python3-scipy @@ -253,6 +257,10 @@ popd %endif %changelog +* Wed Oct 11 2023 Jerry James - 1.11.3-1 +- New upstream release 1.11.3 + resolves: #2211813 + * Wed Jul 12 2023 psimovec - 1.11.1-1 - New upstream release 1.11.1 resolves: #2211813 diff --git a/sources b/sources index c884f84..366df92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scipy-1.11.1.tar.gz) = 049c9061ccbf101e6f93e055f905616bc7775fbc51c3af99d8533aedc828c5e55d525ccd98b7299280ed706f3298975f28127de9b66809dfe198b0cc4fef466b +SHA512 (scipy-1.11.3.tar.gz) = 6491c4e479d9f4f02e677396a25ddca947a0dc6c009fc2ec34c658012a6224c0b535f14045bb011fbde9973ea987d184574ed64e6760c31798ec860eb0896fcf