From 5ea4d0445039ef46f4da9d68211f1fe0f9c27bba Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Wed, 19 Feb 2025 13:08:20 +0100
Subject: [PATCH] py-scipy: add v1.15.2 (#49074)
---
var/spack/repos/builtin/packages/nrm/package.py | 4 ----
var/spack/repos/builtin/packages/py-scipy/package.py | 3 +++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/var/spack/repos/builtin/packages/nrm/package.py b/var/spack/repos/builtin/packages/nrm/package.py
index 942a99b6a52..c993c5c4c25 100644
--- a/var/spack/repos/builtin/packages/nrm/package.py
+++ b/var/spack/repos/builtin/packages/nrm/package.py
@@ -13,10 +13,6 @@ class Nrm(PythonPackage):
version("0.1.0", sha256="911a848042fa50ed216c818e0667bcd3e4219687eb5a35476b7313abe12106dc")
depends_on("py-setuptools", type=("build"))
- # using py-pip@23.1 results in
- # ValueError: ZIP does not support timestamps before 1980
- depends_on("py-pip@:23.0", type="build")
-
depends_on("py-six", type=("build", "run"))
depends_on("py-pyzmq@17.1.2", type=("build", "run"))
depends_on("py-pyyaml", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py
index 7b18536906f..ebfa8ae8122 100644
--- a/var/spack/repos/builtin/packages/py-scipy/package.py
+++ b/var/spack/repos/builtin/packages/py-scipy/package.py
@@ -17,6 +17,7 @@ class PyScipy(PythonPackage):
license("BSD-3-Clause")
version("main", branch="main")
+ version("1.15.2", sha256="cd58a314d92838f7e6f755c8a2167ead4f27e1fd5c1251fd54289569ef3495ec")
version("1.15.1", sha256="033a75ddad1463970c96a88063a1df87ccfddd526437136b6ee81ff0312ebdf6")
version("1.15.0", sha256="300742e2cc94e36a2880ebe464a1c8b4352a7b0f3e36ec3d2ac006cdbe0219ac")
version("1.14.1", sha256="5a275584e726026a5699459aa72f828a610821006228e841b94275c4a7c08417")
@@ -195,6 +196,8 @@ class PyScipy(PythonPackage):
# Intel OneAPI ifx claims to support -fvisibility, but this does not work.
# Meson adds this flag for all Python extensions which include Fortran code.
conflicts("%oneapi@:2023.0", when="@1.9:")
+ # Unknown build error, version ranges may be incorrect
+ conflicts("%oneapi@2024:", when="@:1.8")
# error: expected unqualified-id (exact compiler versions unknown)
conflicts("%apple-clang@15:", when="@:1.9")
--
GitLab