From 4712b760dcfe7fc8b2894e90abb8795f090f12dc Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 10 Jul 2025 14:29:10 -0700 Subject: [PATCH 1/5] MAINT: adds plugin install tab for apple silicon arch --- src/lib/components/InstallPlugin.svelte | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/lib/components/InstallPlugin.svelte b/src/lib/components/InstallPlugin.svelte index 123e6b51..8f481d79 100644 --- a/src/lib/components/InstallPlugin.svelte +++ b/src/lib/components/InstallPlugin.svelte @@ -9,10 +9,20 @@ } const create = $derived(`conda env create --name ${env_name} --file ${env_url}`); + const create_silicon = $derived(` + CONDA_SUBDIR=osx-64 conda env create \ + --name ${env_name} \ + --file ${env_url} \ + conda activate ${env_name} \ + conda config --env --set subdir osx-64 + `); const update = $derived(`conda env update --file ${env_url}`); const ast = $derived(u('div', key({class: '-my-5'}), [u('tabSet', key(), [ - u('tabItem', key({title: '[Fresh Install]'}), [ + u('tabItem', key({title: '[Fresh Install (Apple Silicon)]'}), [ + u('code', key({lang: 'bash', class: '!my-3'}), create_silicon), + ]), + u('tabItem', key({title: '[Fresh Install (all other architectures)]'}), [ u('code', key({lang: 'bash', class: '!my-3'}), create), ]), u('tabItem', key({title: '[Update Existing]'}), [ @@ -23,4 +33,4 @@ - \ No newline at end of file + From 0d6f4e13a0b36beeaec33d502ab3af6404fb4b3c Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 10 Jul 2025 14:35:11 -0700 Subject: [PATCH 2/5] fix newline spacing --- src/lib/components/InstallPlugin.svelte | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/lib/components/InstallPlugin.svelte b/src/lib/components/InstallPlugin.svelte index 8f481d79..a46dee57 100644 --- a/src/lib/components/InstallPlugin.svelte +++ b/src/lib/components/InstallPlugin.svelte @@ -9,13 +9,15 @@ } const create = $derived(`conda env create --name ${env_name} --file ${env_url}`); - const create_silicon = $derived(` - CONDA_SUBDIR=osx-64 conda env create \ - --name ${env_name} \ - --file ${env_url} \ - conda activate ${env_name} \ - conda config --env --set subdir osx-64 - `); + const create_silicon = $derived( + [ + "CONDA_SUBDIR=osx-64 conda env create", + `--name ${env_name}`, + `--file ${env_url}`, + `conda activate ${env_name}`, + "conda config --env --set subdir osx-64" + ].join('\n') + ); const update = $derived(`conda env update --file ${env_url}`); const ast = $derived(u('div', key({class: '-my-5'}), [u('tabSet', key(), [ From 22796ed6df2d3c8f8d752b04e5b47bad67c386e2 Mon Sep 17 00:00:00 2001 From: Liz Gehret <54517601+lizgehret@users.noreply.github.com> Date: Thu, 10 Jul 2025 16:10:43 -0700 Subject: [PATCH 3/5] Update src/lib/components/InstallPlugin.svelte Co-authored-by: Evan Bolyen --- src/lib/components/InstallPlugin.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/components/InstallPlugin.svelte b/src/lib/components/InstallPlugin.svelte index a46dee57..d26ab1cc 100644 --- a/src/lib/components/InstallPlugin.svelte +++ b/src/lib/components/InstallPlugin.svelte @@ -11,9 +11,9 @@ const create = $derived(`conda env create --name ${env_name} --file ${env_url}`); const create_silicon = $derived( [ - "CONDA_SUBDIR=osx-64 conda env create", - `--name ${env_name}`, - `--file ${env_url}`, + "CONDA_SUBDIR=osx-64 conda env create \\", + ` --name ${env_name} \\`, + ` --file ${env_url}`, `conda activate ${env_name}`, "conda config --env --set subdir osx-64" ].join('\n') From 6db3b129d6bc55f0f66f26cbb4333598863da434 Mon Sep 17 00:00:00 2001 From: Liz Gehret Date: Thu, 10 Jul 2025 16:21:15 -0700 Subject: [PATCH 4/5] shortened tab names --- src/lib/components/InstallPlugin.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/InstallPlugin.svelte b/src/lib/components/InstallPlugin.svelte index d26ab1cc..91163cb0 100644 --- a/src/lib/components/InstallPlugin.svelte +++ b/src/lib/components/InstallPlugin.svelte @@ -21,10 +21,10 @@ const update = $derived(`conda env update --file ${env_url}`); const ast = $derived(u('div', key({class: '-my-5'}), [u('tabSet', key(), [ - u('tabItem', key({title: '[Fresh Install (Apple Silicon)]'}), [ + u('tabItem', key({title: '[Fresh Install (🍏 Silicon)]'}), [ u('code', key({lang: 'bash', class: '!my-3'}), create_silicon), ]), - u('tabItem', key({title: '[Fresh Install (all other architectures)]'}), [ + u('tabItem', key({title: '[Fresh Install (Other Archs)]'}), [ u('code', key({lang: 'bash', class: '!my-3'}), create), ]), u('tabItem', key({title: '[Update Existing]'}), [ From c217f6e11267324a7c5678ecc9c3d513f9e2be79 Mon Sep 17 00:00:00 2001 From: Greg Caporaso Date: Thu, 4 Sep 2025 11:24:46 -0700 Subject: [PATCH 5/5] reorder tabs --- src/lib/components/InstallPlugin.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/components/InstallPlugin.svelte b/src/lib/components/InstallPlugin.svelte index 91163cb0..ca6754cd 100644 --- a/src/lib/components/InstallPlugin.svelte +++ b/src/lib/components/InstallPlugin.svelte @@ -21,12 +21,12 @@ const update = $derived(`conda env update --file ${env_url}`); const ast = $derived(u('div', key({class: '-my-5'}), [u('tabSet', key(), [ - u('tabItem', key({title: '[Fresh Install (🍏 Silicon)]'}), [ - u('code', key({lang: 'bash', class: '!my-3'}), create_silicon), - ]), - u('tabItem', key({title: '[Fresh Install (Other Archs)]'}), [ + u('tabItem', key({title: '[Fresh Install]'}), [ u('code', key({lang: 'bash', class: '!my-3'}), create), ]), + u('tabItem', key({title: '[Fresh Install (Apple Silicon)]'}), [ + u('code', key({lang: 'bash', class: '!my-3'}), create_silicon), + ]), u('tabItem', key({title: '[Update Existing]'}), [ u('paragraph', key(), [u('text', key(), `Activate your environment (${base_env}) and run:`)]), u('code', key({lang: 'bash', class: '!mb-3 !-mt-3'}), update),