Use pip to install scipy

sfegan · Dec 6, 2024 · 6220ea8 · 6220ea8
1 parent 66954a0
commit 6220ea8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/singularity-build-and-deploy.yml b/.github/workflows/singularity-build-and-deploy.yml
@@ -49,11 +49,13 @@ jobs:
       run: |
         sudo apt-get update -y
         sudo apt-get install -y gsl-bin libgsl0-dev libfftw3-dev               \
-          libzmq3-dev python3 python3-dev python3-numpy libxerces-c-dev        \
+          libzmq3-dev python3 python3-dev python3-pip libxerces-c-dev        \
           libpcap-dev libz-dev libprotobuf-c-dev protobuf-c-compiler           \
           libprotobuf-dev protobuf-compiler libprotoc-dev libzstd-dev          \
           build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools    \
           libseccomp-dev pkg-config libfuse3-dev
+        sudo pip3 install --upgrade pip
+        sudo pip3 install numpy
         curl -L https://github.com/llr-cta/CTA_ADH_APIS_Build/releases/download/${{matrix.os}}/cta_adh_apis_installed.tgz | sudo tar -zxf - -C /
         curl -L https://github.com/llr-cta/Geant4Build/releases/download/${{matrix.os}}-${{env.geant_version}}-OFF/Geant4-${{matrix.os}}-${{env.geant_version}}-OFF.tbz2 | sudo tar -jxf - -C /
 

diff --git a/singularity_build.def b/singularity_build.def
@@ -54,9 +54,6 @@ From: ubuntu:22.04
         zlib1g                                                     \
         python3                                                    \
         python3-pip                                                \
-        python3-numpy                                              \
-        python3-scipy                                              \
-        python3-matplotlib                                         \
         cython3                                                    \
         fftw3                                                      \
         sqlite3                                                    \
@@ -84,8 +81,9 @@ From: ubuntu:22.04
     apt-get -y autoremove
     apt-get -y clean
 
-    pip3 install notebook cdsapi ecmwf-api-client astropy gammapy
-    pip3 install --upgrade google-api-python-client google-auth-httplib2 google-auth-oauthlib
+    pip3 install --upgrade pip
+    pip3 install numpy scipy matplotlib notebook cdsapi ecmwf-api-client astropy gammapy
+    pip3 install google-api-python-client google-auth-httplib2 google-auth-oauthlib
 
     export G4DATADIR=/usr/share/Geant4/data
     # export G4URL=http://geant4-data.web.cern.ch/datasets