Merge branch 'master' into future_pparam

Author: mkoura

.github/setup_venv.sh

@@ -19,7 +19,7 @@ fi
 
 # Filter out nix python packages from PYTHONPATH.
 # This avoids conflicts between nix-installed packages and poetry virtual environment packages.
-PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//')"
+PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//' || :)"
 if [ -n "${PYTHONPATH:-}" ]; then
   export PYTHONPATH
 else

.source.dev

@@ -24,7 +24,7 @@ fi
 
 # Filter out nix python packages from PYTHONPATH.
 # This avoids conflicts between nix-installed packages and poetry virtual environment packages.
-PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//')"
+PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//' || :)"
 if [ -n "${PYTHONPATH:-}" ]; then
   export PYTHONPATH
 else
@@ -47,7 +47,7 @@ mkdir -p "$TMPDIR"
 export TMPDIR
 
 # Remove ghcup from PATH to avoid conflicts with nix environment
-PATH="$(echo "$PATH" | tr ":" "\n" | grep -v "ghcup" | tr "\n" ":" | sed 's/:*$//')"
+PATH="$(echo "$PATH" | tr ":" "\n" | grep -v "ghcup" | tr "\n" ":" | sed 's/:*$//' || :)"
 export PATH
 
 # Prepend instance-specific .bin directory to PATH if it exists and if not already present

poetry_update_deps.sh

@@ -18,7 +18,7 @@ fi
 
 # Filter out nix python packages from PYTHONPATH.
 # This avoids conflicts between nix-installed packages and poetry virtual environment packages.
-PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//')"
+PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//' || :)"
 if [ -n "${PYTHONPATH:-}" ]; then
   export PYTHONPATH
 else

prepare_test_env.sh

@@ -54,7 +54,7 @@ if [ -z "\${IN_NIX_SHELL:-""}" ]; then
   echo "WARNING: This script is supposed to be sourced from nix shell." >&2
 fi
 source "$VIRTUAL_ENV/bin/activate"
-PYTHONPATH="\$(echo "\${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//')"
+PYTHONPATH="\$(echo "\${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//' || :)"
 if [ -n "\${PYTHONPATH:-}" ]; then
   export PYTHONPATH
 else

scripts/clusterlib_reinstall_editable.sh

@@ -26,7 +26,7 @@ fi
 
 # Filter out nix python packages from PYTHONPATH.
 # This avoids conflicts between nix-installed packages and poetry virtual environment packages.
-PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//')"
+PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//' || :)"
 if [ -n "${PYTHONPATH:-}" ]; then
   export PYTHONPATH
 else

scripts/setup_dev_venv.sh

@@ -11,7 +11,7 @@ set -eu
 filter_out_nix(){
   # Filter out nix python packages from PYTHONPATH.
   # This avoids conflicts between nix-installed packages and poetry virtual environment packages.
-  PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//')"
+  PYTHONPATH="$(echo "${PYTHONPATH:-}" | tr ":" "\n" | grep -v "/nix/store/.*/site-packages" | tr "\n" ":" | sed 's/:*$//' || :)"
   if [ -n "${PYTHONPATH:-}" ]; then
     export PYTHONPATH
   else