From 90cde7211ee64e758fee7c5f132b1c2a24222eeb Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 20 Nov 2023 08:56:57 -0500 Subject: [PATCH] python3-scipy: update to 1.11.4. --- .../python3-scipy/patches/dep-versions.patch | 18 +++--------------- srcpkgs/python3-scipy/template | 9 ++++----- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/srcpkgs/python3-scipy/patches/dep-versions.patch b/srcpkgs/python3-scipy/patches/dep-versions.patch index 008d85ee492..ac62f0b7fb0 100644 --- a/srcpkgs/python3-scipy/patches/dep-versions.patch +++ b/srcpkgs/python3-scipy/patches/dep-versions.patch @@ -3,16 +3,15 @@ causes build failures against more up-to-date Void packages. --- a/pyproject.toml +++ b/pyproject.toml -@@ -11,14 +11,14 @@ +@@ -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 Cython 0.29.x - # (too many changes in 3.0) + # 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", # 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", @@ -22,14 +21,3 @@ causes build failures against more up-to-date Void packages. # NumPy dependencies - to update these, sync from # https://github.com/scipy/oldest-supported-numpy/, and then -@@ -42,8 +42,8 @@ - # however macOS was broken and it's safe C API/ABI-wise to build against 1.21.6 - # (see oldest-supported-numpy issues gh-28 and gh-45) - "numpy==1.21.6; python_version=='3.10' and (platform_system!='Windows' and platform_machine!='loongarch64') and platform_python_implementation != 'PyPy'", -- "numpy==1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'", -- "numpy>=1.26.0,<1.27.0; python_version=='3.12'", # no `==` because we expect relevant bug fixes in 1.26.1/2 -+ "numpy>=1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'", -+ "numpy>=1.26.0; python_version=='3.12'", # no `==` because we expect relevant bug fixes in 1.26.1/2 - - # For Python versions which aren't yet officially supported, - # we specify an unpinned NumPy which allows source distributions diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index cb057895157..88128aaa3a3 100644 --- a/srcpkgs/python3-scipy/template +++ b/srcpkgs/python3-scipy/template @@ -1,15 +1,14 @@ # Template file for 'python3-scipy' pkgname=python3-scipy -version=1.11.3 +version=1.11.4 revision=1 build_style=python3-pep517 build_helper="meson numpy" make_build_args=" $(vopt_if openblas "" "-Csetup-args=-Dblas=blas -Csetup-args=-Dlapack=lapack") " -hostmakedepends="python3-build python3-installer python3-meson-python - python3-wheel python3-Cython python3-pybind11 pythran python3-numpy - gcc-fortran pkg-config" +hostmakedepends="python3-meson-python python3-Cython python3-pybind11 + pythran python3-numpy gcc-fortran pkg-config" makedepends="python3-devel python3-pybind11 python3-numpy pythran $(vopt_if openblas openblas-devel "lapack-devel cblas-devel")" depends="python3-numpy" @@ -18,7 +17,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://scipy.org/" distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz" -checksum=bba4d955f54edd61899776bad459bf7326e14b9fa1c552181f0479cc60a568cd +checksum=90a2b78e7f5733b9de748f589f09225013685f9b218275257f8a8168ededaeaa make_check="no" # Tests need an installed copy to run and meson makes this tough build_options="openblas"