Skip to content

Commit 262dae3

Browse files
committed
Fix handling of test/.CondaPkg
1 parent eabb85d commit 262dae3

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ data/ram_air_kite/ram_air_kite_foil_cm_polar.csv
3838
output/
3939
output_cairo/
4040
examples_cp/.CondaPkg/
41+
test/.CondaPkg/
4142
LocalPreferences.toml

bin/install_controlplots

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,10 @@ if [[ "$_backend" == "system" ]]; then
252252
echo "Removing ${CONTROLPLOTS_PROJECT}/.CondaPkg (switching from CondaPkg to system Python)..."
253253
rm -rf "${CONTROLPLOTS_PROJECT}/.CondaPkg"
254254
fi
255+
if [[ -d "${TEST_PROJECT}/.CondaPkg" ]]; then
256+
echo "Removing ${TEST_PROJECT}/.CondaPkg (switching from CondaPkg to system Python)..."
257+
rm -rf "${TEST_PROJECT}/.CondaPkg"
258+
fi
255259
# Unset JULIA_PYTHONCALL_EXE so the LocalPreferences.toml exe setting takes
256260
# effect.
257261
unset JULIA_PYTHONCALL_EXE

0 commit comments

Comments
 (0)