Merge pull request #145 from LSSTDESC/issue/144/pythonuserbase

add support for PYTHONUSERBASE setup using DESCPYTHONUSERBASE

Author: heather999

jupyter-kernels/setup/setup_bleed_python.sh

@@ -20,6 +20,20 @@ if [ -n "$DESCUSERENV" ]; then
    conda activate $DESCUSERENV
 fi
 
+python_ver_major=$(python -c 'import sys; print(sys.version_info.major)')
+python_ver_minor=$(python -c 'import sys; print(sys.version_info.minor)')
+export DESCPYTHONVER="python$python_ver_major.$python_ver_minor"
+
+export PYTHONPATH=$PYTHONPATH:$LSST_INST_DIR/$LSST_PYTHON_VER
+
+if [ -n "$DESCPYTHONBLEEDUSERBASE" ]; then
+    export PYTHONUSERBASE=$DESCPYTHONBLEEDUSERBASE
+    unset PYTHONUSERSITE
+    export PYTHONPATH="$PYTHONUSERBASE/lib/$DESCPYTHONVER/site-packages:$PYTHONPATH"
+    echo "using DESCPYTHONBLEEDUSERBASE: $DESCPYTHONBLEEDUSERBASE"
+fi
+
+
 export HDF5_USE_FILE_LOCKING=FALSE
 
 if [ $# -gt 0 ] ; then

jupyter-kernels/setup/setup_current_python.sh

@@ -31,19 +31,39 @@ export PYTHONNOUSERSITE=' '
 
 export DESC_GCR_SITE='nersc'
 
+
+#if [ -n "$DESCPYTHONUSERBASE" ]; then
+#    export PYTHONUSERBASE=$DESCPYTHONUSERBASE	
+#    unset PYTHONUSERSITE
+#    echo "using DESCPYTHONUSERBASE: $DESCPYTHONUSERBASE"
+#fi
+
 source $LSST_INST_DIR/$LSST_PYTHON_VER/etc/profile.d/conda.sh
 conda activate base
 if [ -n "$DESCUSERENV" ]; then
    conda activate $DESCUSERENV
 fi
 
+
+# Set this after conda environment is setup
+python_ver_major=$(python -c 'import sys; print(sys.version_info.major)')
+python_ver_minor=$(python -c 'import sys; print(sys.version_info.minor)')
+export DESCPYTHONVER="python$python_ver_major.$python_ver_minor"
+
 if [ -n "$DESCPYTHONPATH" ]; then
     export PYTHONPATH=$PYTHONPATH:"$DESCPYTHONPATH"
     echo "Including user python path: $DESCPYTHONPATH"
 fi 
 
 export PYTHONPATH=$PYTHONPATH:$LSST_INST_DIR/$LSST_PYTHON_VER
 
+if [ -n "$DESCPYTHONUSERBASE" ]; then
+    export PYTHONUSERBASE=$DESCPYTHONUSERBASE	
+    unset PYTHONUSERSITE
+    export PYTHONPATH="$PYTHONUSERBASE/lib/$DESCPYTHONVER/site-packages:$PYTHONPATH"
+    echo "using DESCPYTHONUSERBASE: $DESCPYTHONUSERBASE"
+fi
+
 OUTPUTPY="$(which python)"
 echo Now using "${OUTPUTPY}"
 

jupyter-kernels/setup/stack-weekly.sh

@@ -26,6 +26,19 @@ if [ -n "$DESCSTACKUSERENV" ]; then
     echo "Wondering Why? DESCSTACKUSERENV is likely set in your $HOME/.basrhc, $HOME/.bashrc.ext, or similar config script"
 fi
 
+python_ver_major=$(python -c 'import sys; print(sys.version_info.major)')
+python_ver_minor=$(python -c 'import sys; print(sys.version_info.minor)')
+export DESCPYTHONVER="python$python_ver_major.$python_ver_minor"
+
+export PYTHONPATH=$PYTHONPATH:$LSST_INST_DIR/$LSST_PYTHON_VER
+
+if [ -n "$DESCSTACKUSERBASE" ]; then
+    export PYTHONUSERBASE=$DESCSTACKUSERBASE
+    unset PYTHONUSERSITE
+    export PYTHONPATH="$PYTHONUSERBASE/lib/$DESCPYTHONVER/site-packages:$PYTHONPATH"
+    echo "using DESCPYTHONUSERBASE: $DESCSTACKUSERBASE"
+fi
+
 
 export PYTHONPATH=".:$PYTHONPATH"