Skip to content

Commit 835458d

Browse files
committed
Change default to Conda
1 parent 4432376 commit 835458d

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

bin/install_controlplots

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ if [[ -z "$_backend" ]]; then
7676
echo " - Self-contained; downloads ~200 MB on first use"
7777
echo ""
7878
if [[ "$_yes" == true ]]; then
79-
_choice="1"
80-
echo "Using default: 1 (system Python)"
79+
_choice="2"
80+
echo "Using default: 2 (CondaPkg)"
8181
else
82-
read -rp "Enter 1 or 2 [default: 1]: " _choice
82+
read -rp "Enter 1 or 2 [default: 2]: " _choice
8383
fi
84-
case "${_choice:-1}" in
84+
case "${_choice:-2}" in
8585
1) _backend="system" ;;
8686
2) _backend="conda" ;;
8787
*)
@@ -206,6 +206,14 @@ if [[ "$_backend" == "system" ]]; then
206206
fi
207207
echo "Found system Python: $_syspython"
208208

209+
# Remove the CondaPkg-managed environment so that setup_env does not set
210+
# JULIA_PYTHONCALL_EXE to the conda Python, which would override the system
211+
# Python configured below.
212+
if [[ -d "examples/.CondaPkg" ]]; then
213+
echo "Removing examples/.CondaPkg (switching from CondaPkg to system Python)..."
214+
rm -rf "examples/.CondaPkg"
215+
fi
216+
209217
echo ""
210218
echo "Saving python_exe=$_syspython to examples/LocalPreferences.toml..."
211219
# Write (or update) LocalPreferences.toml in the examples directory so that

0 commit comments

Comments
 (0)