mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
python3-scipy: update to 1.12.0.
This commit is contained in:
parent
d05becd774
commit
13650bd2e8
3 changed files with 50 additions and 26 deletions
40
srcpkgs/python3-scipy/patches/19909.patch
Normal file
40
srcpkgs/python3-scipy/patches/19909.patch
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
See: https://github.com/scipy/scipy/pull/19909
|
||||||
|
|
||||||
|
From 8c96a1f742335bca283aae418763aaba62c03378 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ilhan Polat <ilhanpolat@gmail.com>
|
||||||
|
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 <prefix2>syevr(compute_v,range,lower,n,a,lda,vl,vu,il,iu,abstol,w,z,m
|
||||||
|
<ftype2> optional,intent(in) :: vl=0.0
|
||||||
|
<ftype2> optional,intent(in),check(vu>=vl),depend(vl) :: vu=1.0
|
||||||
|
<ftype2> 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 <prefix2c>heevr(compute_v,range,lower,n,a,lda,vl,vu,il,iu,abstol,w,z,
|
||||||
|
<ftype2> optional,intent(in) :: vl=0.0
|
||||||
|
<ftype2> optional,intent(in),check(vu>vl),depend(vl) :: vu=1.0
|
||||||
|
<ftype2> 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)
|
|
@ -1,23 +0,0 @@
|
||||||
Several dependencies have needlessly restrictive version requirements, which
|
|
||||||
causes build failures against more up-to-date Void packages.
|
|
||||||
|
|
||||||
--- a/pyproject.toml
|
|
||||||
+++ b/pyproject.toml
|
|
||||||
@@ -11,13 +11,13 @@
|
|
||||||
build-backend = 'mesonpy'
|
|
||||||
requires = [
|
|
||||||
# Reason for `<`: future-proofing (0.14.0 released and known to work)
|
|
||||||
- "meson-python>=0.12.1,<0.15.0",
|
|
||||||
+ "meson-python>=0.12.1",
|
|
||||||
# Reason for `<`: we want to build the 1.11.x releases with 0.29.x (too many changes in 3.0)
|
|
||||||
- "Cython>=0.29.35,<3.0", # when updating version, also update check in meson.build
|
|
||||||
+ "Cython>=0.29.35",
|
|
||||||
# Reason for `<`: future-proofing (2.11.1 is the most recent version)
|
|
||||||
- "pybind11>=2.10.4,<2.11.1",
|
|
||||||
+ "pybind11>=2.10.4",
|
|
||||||
# Reason for `<`: future-proofing (0.14.0 released and known to work)
|
|
||||||
- "pythran>=0.12.0,<0.15.0",
|
|
||||||
+ "pythran>=0.12.0",
|
|
||||||
|
|
||||||
# NumPy dependencies - to update these, sync from
|
|
||||||
# https://github.com/scipy/oldest-supported-numpy/, and then
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'python3-scipy'
|
# Template file for 'python3-scipy'
|
||||||
pkgname=python3-scipy
|
pkgname=python3-scipy
|
||||||
version=1.11.4
|
version=1.12.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=python3-pep517
|
build_style=python3-pep517
|
||||||
build_helper="meson numpy"
|
build_helper="meson numpy"
|
||||||
|
@ -12,13 +12,16 @@ hostmakedepends="python3-meson-python python3-Cython python3-pybind11
|
||||||
makedepends="python3-devel python3-pybind11 python3-numpy pythran
|
makedepends="python3-devel python3-pybind11 python3-numpy pythran
|
||||||
$(vopt_if openblas openblas-devel "lapack-devel cblas-devel")"
|
$(vopt_if openblas openblas-devel "lapack-devel cblas-devel")"
|
||||||
depends="python3-numpy"
|
depends="python3-numpy"
|
||||||
|
checkdepends="python3-pytest python3-pytest-xdist python3-hypothesis python3-pooch
|
||||||
|
python3-matplotlib python3-mpmath python3-psutil python3-sympy"
|
||||||
short_desc="Scientific library for Python3"
|
short_desc="Scientific library for Python3"
|
||||||
maintainer="Andrew J. Hesford <ajh@sideband.org>"
|
maintainer="Andrew J. Hesford <ajh@sideband.org>"
|
||||||
license="BSD-3-Clause"
|
license="BSD-3-Clause"
|
||||||
homepage="https://scipy.org/"
|
homepage="https://scipy.org/"
|
||||||
distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz"
|
distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz"
|
||||||
checksum=90a2b78e7f5733b9de748f589f09225013685f9b218275257f8a8168ededaeaa
|
checksum=4bf5abab8a36d20193c698b0f1fc282c1d083c94723902c447e5d2f1780936a3
|
||||||
make_check="no" # Tests need an installed copy to run and meson makes this tough
|
# must be tested from site dir of installed version (see dev.py:739)
|
||||||
|
make_check_pre='eval env -C "${testdir}/${py3_sitelib}"'
|
||||||
|
|
||||||
build_options="openblas"
|
build_options="openblas"
|
||||||
|
|
||||||
|
@ -37,6 +40,10 @@ if [ "$build_option_openblas" ]; then
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$XBPS_CHECK_PKGS" != full ]; then
|
||||||
|
make_check_args="-m 'not slow'"
|
||||||
|
fi
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense LICENSE.txt
|
vlicense LICENSE.txt
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue