Changeset 28048

Timestamp:

01/09/24 19:35:14 (15 months ago)

Author:

jdquinn

Message:

CHG: Handle cases where PYTHONPATH already has a value; updating config for netcdf-python for machines where we do not want to install via pip

Location:

issm/trunk-jpl

Files:

• externalpackages/netcdf-python/install.sh (modified) (1 diff)
• jenkins/jenkins.sh (modified) (1 diff)
• jenkins/ub-ccr (modified) (1 diff)

issm/trunk-jpl/externalpackages/netcdf-python/install.sh

@@ -5 +5 @@
 # Constants
 #
-VER="1.5.3"
+VER="1.6.5"
 
 # Environment

issm/trunk-jpl/jenkins/jenkins.sh

@@ -413 +413 @@
 if [ $PYTHON_TEST -eq 1 ]; then
         # Launch all tests on different CPUs
-        export PYTHONPATH="${ISSM_DIR}/src/m/dev"
+        if [ -z $PYTHONPATH ]; then
+                export PYTHONPATH="${ISSM_DIR}/src/m/dev"
+        else
+                export PYTHONPATH="${ISSM_DIR}/src/m/dev:${PYTHONPATH}"
+        fi
         export PYTHONSTARTUP="${PYTHONPATH}/devpath.py"
         export PYTHONUNBUFFERED=1 # We don't want Python to buffer otherwise issm.exe output is not captured

issm/trunk-jpl/jenkins/ub-ccr

@@ -39 +39 @@
 
 EXTERNALPACKAGES="
-        autotools       install-linux.sh
-        cmake           install.sh
-        petsc           install-3.14-linux.sh
-        gsl                     install.sh
-        boost           install-1.7-linux.sh
-        dakota          install-6.2-linux.sh
-        chaco           install-linux.sh
-        hdf5            install-1-parallel.sh
-        netcdf          install-4.7-parallel.sh
-        triangle        install-linux.sh
-        m1qn3           install.sh
-        semic           install.sh
-        shell2junit     install.sh
+        autotools               install-linux.sh
+        cmake                   install.sh
+        petsc                   install-3.14-linux.sh
+        gsl                             install.sh
+        boost                   install-1.7-linux.sh
+        dakota                  install-6.2-linux.sh
+        chaco                   install-linux.sh
+        hdf5                    install-1-parallel.sh
+        netcdf                  install-4.7-parallel.sh
+        netcdf-python   install.sh
+        triangle                install-linux.sh
+        m1qn3                   install.sh
+        semic                   install.sh
+        shell2junit             install.sh
 "