fix(conda): restore ability to rerun install script without removing …

…conda env The --force flag was deprecated and replaces by --yes which is currently undocumented conda/conda#13704 This fix makes use of the new functionality
openwpm · Jan 16, 2025 · d23fc19 · d23fc19
1 parent 023ae8d
commit d23fc19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/install.sh b/install.sh
@@ -29,10 +29,10 @@ if [ "$1" != "--skip-create" ]; then
   case "$(uname -s)" in
   Darwin)
     echo '...using the osx-64 channel for MacOS dependencies'
-    CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create -q -f environment.yaml
+    CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create --yes -q -f environment.yaml
     ;;
   *)
-    PYTHONNOUSERSITE=True conda env create -q -f environment.yaml
+    PYTHONNOUSERSITE=True conda env create --yes -q -f environment.yaml
     ;;
   esac
 

diff --git a/scripts/repin.sh b/scripts/repin.sh
@@ -15,10 +15,10 @@ eval "$(conda shell.bash hook)"
 case "$(uname -s)" in
 Darwin)
   echo 'Using the osx-64 channel for MacOS dependencies...'
-  CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create -q -f environment-unpinned.yaml
+  CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create --yes -q -f environment-unpinned.yaml
   ;;
 *)
-  PYTHONNOUSERSITE=True conda env create -q -f environment-unpinned.yaml
+  PYTHONNOUSERSITE=True conda env create --yes -q -f environment-unpinned.yaml
   ;;
 esac