diff --git a/.gitlab/scripts.yml b/.gitlab/scripts.yml index 069bfaf6a..4b3612395 100644 --- 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 index 6152fbd35..f014b85a7 100644 --- a/scripts/spack/packages/spheral/package.py +++ b/scripts/spack/packages/spheral/package.py @@ -64,7 +64,7 @@ class Spheral(CachedCMakePackage, CudaPackage): extends('python@3.9.10 +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')