Brought numpy version back, removed python module load from gitlab sc…

…ript to stop scipy from using the wrong pkg-config on the CZ
LLNL · May 9, 2024 · 8200720 · 8200720
1 parent 4692ddf
commit 8200720
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.gitlab/scripts.yml b/.gitlab/scripts.yml
@@ -12,7 +12,6 @@
     - cd $CI_BUILD_DIR
     - echo $SPEC
 
-    - ml load python/3
     - $BUILD_ALLOC ./$SCRIPT_DIR/gitlab/build_and_install.py --spec="$SPEC" --extra-cmake-args="$EXTRA_CMAKE_ARGS"
 
 .build_and_test:

diff --git a/scripts/spack/packages/spheral/package.py b/scripts/spack/packages/spheral/package.py
@@ -64,7 +64,7 @@ class Spheral(CachedCMakePackage, CudaPackage):
 
     extends('[email protected] +zlib +shared +ssl +tkinter', type='build')
 
-    depends_on('py-numpy', type='build')
+    depends_on('py-numpy@1.23.4', type='build')
     depends_on('py-numpy-stl', type='build')
     depends_on('py-pillow', type='build')
     depends_on('py-matplotlib backend=tkagg +fonts', type='build')