From 2d509dc3eb3da4129d396024e3a475fc0fdbfe94 Mon Sep 17 00:00:00 2001
From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com>
Date: Sun, 1 Oct 2023 10:29:21 -0700
Subject: py-scipy: -fvisibility issue is resolved in 2023.1.0: (#39464)

* py-scipy: -fvisibility issue is resolved in 2023.1.0:

* e4s oneapi ci: add py-scipy
---
 share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml | 3 +++
 var/spack/repos/builtin/packages/py-scipy/package.py            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
index a4264f7ed0..2c97d4e4be 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
@@ -237,6 +237,9 @@ spack:
   # - sundials +sycl cxxstd=17          # sundials: include/sunmemory/sunmemory_sycl.h:20:10: fatal error: 'CL/sycl.hpp' file not found
   # - tau +mpi +opencl +level_zero ~pdt # builds ok in container, but needs libdrm, will update container
 
+  # Not necessarily E4S, but useful for E4S packages
+  - py-scipy
+
   # SKIPPED
   # - nvhpc
   # - dyninst  # only %gcc
diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py
index c1ad924907..4a07657d80 100644
--- a/var/spack/repos/builtin/packages/py-scipy/package.py
+++ b/var/spack/repos/builtin/packages/py-scipy/package.py
@@ -140,7 +140,7 @@ class PyScipy(PythonPackage):
     # https://github.com/mesonbuild/meson/pull/10909#issuecomment-1282241479
     # 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", when="@1.9:")
+    conflicts("%oneapi@:2023.0", when="@1.9:")
 
     # https://github.com/scipy/scipy/issues/12860
     patch(
-- 
cgit v1.2.3-70-g09d2