Skip to content

Commit d23fc19

Browse files
committed
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
1 parent 023ae8d commit d23fc19

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ if [ "$1" != "--skip-create" ]; then
2929
case "$(uname -s)" in
3030
Darwin)
3131
echo '...using the osx-64 channel for MacOS dependencies'
32-
CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create -q -f environment.yaml
32+
CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create --yes -q -f environment.yaml
3333
;;
3434
*)
35-
PYTHONNOUSERSITE=True conda env create -q -f environment.yaml
35+
PYTHONNOUSERSITE=True conda env create --yes -q -f environment.yaml
3636
;;
3737
esac
3838

scripts/repin.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ eval "$(conda shell.bash hook)"
1515
case "$(uname -s)" in
1616
Darwin)
1717
echo 'Using the osx-64 channel for MacOS dependencies...'
18-
CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create -q -f environment-unpinned.yaml
18+
CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create --yes -q -f environment-unpinned.yaml
1919
;;
2020
*)
21-
PYTHONNOUSERSITE=True conda env create -q -f environment-unpinned.yaml
21+
PYTHONNOUSERSITE=True conda env create --yes -q -f environment-unpinned.yaml
2222
;;
2323
esac
2424

0 commit comments

Comments
 (0)