From 8fa7ab4aff55ac8626224fb7a466dda3c444f8db Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Fri, 20 Sep 2024 20:00:40 +0200 Subject: [PATCH] Prepare for installing McStasScript from conda --- mcstas-environment.yml | 5 ++--- mcxtrace-environment.yml | 5 ++--- meta-pkgs/windows/environment.yml | 4 +--- .../Contents/MacOS/Miniforge-inject.command.in | 3 +-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/mcstas-environment.yml b/mcstas-environment.yml index 98703d6ba2..fff3ae7493 100644 --- a/mcstas-environment.yml +++ b/mcstas-environment.yml @@ -37,7 +37,6 @@ dependencies: - jinja2 - mslex - nodejs + - McStasScript - pip - - pip: - - guide_bot - - McStasScript + diff --git a/mcxtrace-environment.yml b/mcxtrace-environment.yml index 2b24e4f860..e2c4758104 100644 --- a/mcxtrace-environment.yml +++ b/mcxtrace-environment.yml @@ -37,7 +37,6 @@ dependencies: - jinja2 - mslex - nodejs + - McStasScript - pip - - pip: - - guide_bot - - McStasScript + diff --git a/meta-pkgs/windows/environment.yml b/meta-pkgs/windows/environment.yml index ef58f5168e..dd316de7e1 100644 --- a/meta-pkgs/windows/environment.yml +++ b/meta-pkgs/windows/environment.yml @@ -32,7 +32,5 @@ dependencies: - typish - jsons - nodejs + - McStasScript - pip - - pip: - - guide_bot - - McStasScript diff --git a/support/MacOSX/McCode-conda.app/Contents/MacOS/Miniforge-inject.command.in b/support/MacOSX/McCode-conda.app/Contents/MacOS/Miniforge-inject.command.in index 3a4d3339b8..532aff143c 100644 --- a/support/MacOSX/McCode-conda.app/Contents/MacOS/Miniforge-inject.command.in +++ b/support/MacOSX/McCode-conda.app/Contents/MacOS/Miniforge-inject.command.in @@ -53,8 +53,7 @@ else then osascript -e "tell app \"System Events\" to display dialog \"Error: Failure occured during conda update conda -y... :-( \"" else - conda install -c conda-forge -c nodefaults @FLAVOR@=@MCCODE_VERSION@ jupytext jupyterlab ipympl scipy numpy -y - pip install mcstasscript + conda install -c conda-forge -c nodefaults @FLAVOR@=@MCCODE_VERSION@ jupytext jupyterlab ipympl scipy numpy mcstasscript -y ret_code6=$? if [ "$ret_code6" != "0" ]; then