From b370ecfbdae97507209e2b23914ae3834a3bb090 Mon Sep 17 00:00:00 2001 From: "Daryl W. Grunau" Date: Sat, 26 Aug 2023 07:44:57 -0600 Subject: py-scipy: re-apply scipy/scipy#14935 workaround (#39555) * re-apply scipy/scipy#14935 workaround * restrict to %intel and eliminate Version() check --------- Co-authored-by: Daryl W. Grunau --- var/spack/repos/builtin/packages/py-scipy/package.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 58f19f8621..36e84550ba 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -193,9 +193,8 @@ class PyScipy(PythonPackage): env.set("NPY_DISTUTILS_APPEND_FLAGS", "1") # https://github.com/scipy/scipy/issues/14935 - if self.spec.satisfies("%intel ^py-pythran") or self.spec.satisfies("%oneapi ^py-pythran"): - if self.spec["py-pythran"].version < Version("0.12"): - env.set("SCIPY_USE_PYTHRAN", "0") + if self.spec.satisfies("%intel ^py-pythran"): + env.set("SCIPY_USE_PYTHRAN", "0") # Pick up BLAS/LAPACK from numpy if self.spec.satisfies("@:1.8"): -- cgit v1.2.3-60-g2f50