diff --git a/srcpkgs/python3-scipy/patches/19909.patch b/srcpkgs/python3-scipy/patches/19909.patch deleted file mode 100644 index b861d2b96c3..00000000000 --- a/srcpkgs/python3-scipy/patches/19909.patch +++ /dev/null @@ -1,40 +0,0 @@ -See: https://github.com/scipy/scipy/pull/19909 - -From 8c96a1f742335bca283aae418763aaba62c03378 Mon Sep 17 00:00:00 2001 -From: Ilhan Polat -Date: Thu, 18 Jan 2024 14:47:42 +0100 -Subject: [PATCH] MAINT:linalg:Adjust lwork/liwork changes OpenBLAS 0.3.26 - -See https://github.com/Reference-LAPACK/lapack/pull/942 ---- - scipy/linalg/flapack_sym_herm.pyf.src | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/scipy/linalg/flapack_sym_herm.pyf.src b/scipy/linalg/flapack_sym_herm.pyf.src -index f07dbaecbc72..af04e0d8d8d8 100644 ---- a/scipy/linalg/flapack_sym_herm.pyf.src -+++ b/scipy/linalg/flapack_sym_herm.pyf.src -@@ -762,8 +762,8 @@ subroutine syevr(compute_v,range,lower,n,a,lda,vl,vu,il,iu,abstol,w,z,m - optional,intent(in) :: vl=0.0 - optional,intent(in),check(vu>=vl),depend(vl) :: vu=1.0 - intent(in) :: abstol=0.0 -- integer optional,intent(in),depend(n),check(lwork>=max(1,26*n)||lwork==-1) :: lwork=max(26*n,1) -- integer optional,intent(in),depend(n),check(liwork>=max(1,10*n)||liwork==-1):: liwork= max(1,10*n) -+ integer optional,intent(in),depend(n),check(lwork>=(n <= 1 ? 1 : max(1,26*n))||lwork==-1) :: lwork=max(26*n,1) -+ integer optional,intent(in),depend(n),check(liwork>=(n <= 1 ? 1 : max(1,10*n))||liwork==-1):: liwork= max(1,10*n) - - integer intent(hide),depend(a) :: n=shape(a,0) - integer intent(hide),depend(n) :: lda=max(1,n) -@@ -832,9 +832,9 @@ subroutine heevr(compute_v,range,lower,n,a,lda,vl,vu,il,iu,abstol,w,z, - optional,intent(in) :: vl=0.0 - optional,intent(in),check(vu>vl),depend(vl) :: vu=1.0 - intent(in) :: abstol=0.0 -- integer optional,intent(in),depend(n),check(lwork>=max(2*n,1)||lwork==-1) :: lwork=max(2*n,1) -- integer optional,intent(in),depend(n),check(lrwork>=max(24*n,1)||lrwork==-1) :: lrwork=max(24*n,1) -- integer optional,intent(in),depend(n),check(liwork>=max(1,10*n)||liwork==-1):: liwork= max(1,10*n) -+ integer optional,intent(in),depend(n),check(lwork>=(n <= 1 ? 1 : max(1,2*n))||lwork==-1) :: lwork=max(2*n,1) -+ integer optional,intent(in),depend(n),check(lrwork>=(n <= 1 ? 1 : max(1,24*n))||lrwork==-1) :: lrwork=max(24*n,1) -+ integer optional,intent(in),depend(n),check(liwork>=(n <= 1 ? 1 : max(1,10*n))||liwork==-1):: liwork= max(1,10*n) - - integer intent(hide),depend(a) :: n=shape(a,0) - integer intent(hide),depend(n) :: lda=max(1,n) diff --git a/srcpkgs/python3-scipy/patches/version-relaxation.patch b/srcpkgs/python3-scipy/patches/version-relaxation.patch index b9959ec47f3..d36aa0fd961 100644 --- a/srcpkgs/python3-scipy/patches/version-relaxation.patch +++ b/srcpkgs/python3-scipy/patches/version-relaxation.patch @@ -2,12 +2,12 @@ SciPy imposes strict and unnecessary version restrictions on its dependencies. --- a/pyproject.toml +++ b/pyproject.toml -@@ -12,7 +12,7 @@ - requires = [ - "meson-python>=0.15.0,<0.16.0", # working with 0.15.x series at branch time - "Cython>=0.29.35,!=3.0.3,<3.1.0", # when updating version, also update check in meson.build -- "pybind11>=2.10.4,<2.12.0", # working with 2.11.x series at branch time -+ "pybind11", - "pythran>=0.15.0,<0.16.0", # working with 0.15.x series at branch time +@@ -35,7 +35,7 @@ + # and disabling build isolation. + # 3. The <2.3 upper bound is for matching the numpy deprecation policy, + # it should not be loosened. +- "numpy>=2.0.0rc1,<2.3", ++ "numpy", + ] - # When numpy 2.0.0rc1 comes out, we should update this to build against 2.0, + [project] diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index 3915ca79f5f..4e05ecdaf32 100644 --- a/srcpkgs/python3-scipy/template +++ b/srcpkgs/python3-scipy/template @@ -1,6 +1,6 @@ # Template file for 'python3-scipy' pkgname=python3-scipy -version=1.12.0 +version=1.13.0 revision=1 build_style=python3-pep517 build_helper="meson numpy" @@ -19,7 +19,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://scipy.org/" distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz" -checksum=4bf5abab8a36d20193c698b0f1fc282c1d083c94723902c447e5d2f1780936a3 +checksum=58569af537ea29d3f78e5abd18398459f195546bb3be23d16677fb26616cc11e # must be tested from site dir of installed version (see dev.py:739) make_check_pre='eval env -C "${testdir}/${py3_sitelib}"'