From dd6785b766fc7a3e85133079b8d0ff5b0326a476 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 23 Sep 2023 21:01:33 -0400 Subject: [PATCH] python3-scipy: update to 1.11.3. --- .../python3-scipy/patches/dep-versions.patch | 30 ++++++++++--------- srcpkgs/python3-scipy/template | 4 +-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/srcpkgs/python3-scipy/patches/dep-versions.patch b/srcpkgs/python3-scipy/patches/dep-versions.patch index dea1fd59201..008d85ee492 100644 --- a/srcpkgs/python3-scipy/patches/dep-versions.patch +++ b/srcpkgs/python3-scipy/patches/dep-versions.patch @@ -3,31 +3,33 @@ causes build failures against more up-to-date Void packages. --- a/pyproject.toml +++ b/pyproject.toml -@@ -10,13 +10,13 @@ - [build-system] +@@ -11,14 +11,14 @@ build-backend = 'mesonpy' requires = [ -- "meson-python>=0.12.1,<0.14.0", # already working with 0.13.x series at branch time -- "Cython>=0.29.35,<3.0", # when updating version, also update check in meson.build -- "pybind11>=2.10.4,<2.11.0", -- "pythran>=0.12.0,<0.14.0", # already working with 0.13.x series at branch time -+ "meson-python>=0.12.1", # already working with 0.13.x series at branch time -+ "Cython>=0.29.35", # when updating version, also update check in meson.build + # 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) +- "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 + # Reason for `<`: future-proofing (2.11.1 is the most recent version) +- "pybind11>=2.10.4,<2.11.1", + "pybind11>=2.10.4", -+ "pythran>=0.12.0", # already working with 0.13.x series at branch time - # `wheel` is needed for non-isolated builds, given that `meson-python` - # doesn't list it as a runtime requirement (at least in 0.5.0) -- "wheel<0.41.0", -+ "wheel", + # 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 -@@ -40,7 +40,7 @@ +@@ -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 0d043287fed..cb057895157 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.11.2 +version=1.11.3 revision=1 build_style=python3-pep517 build_helper="meson numpy" @@ -18,7 +18,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://scipy.org/" distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz" -checksum=b29318a5e39bd200ca4381d80b065cdf3076c7d7281c5e36569e99273867f61d +checksum=bba4d955f54edd61899776bad459bf7326e14b9fa1c552181f0479cc60a568cd make_check="no" # Tests need an installed copy to run and meson makes this tough build_options="openblas"