Merge pull request #1724 from willend/main

Take mcstasscript from conda in the meta-packages.

Author: willend

mcstas-environment.yml

@@ -37,7 +37,6 @@ dependencies:
   - jinja2
   - mslex
   - nodejs
+  - McStasScript
   - pip
-  - pip:
-    - guide_bot
-    - McStasScript
+

mcxtrace-environment.yml

@@ -37,7 +37,6 @@ dependencies:
   - jinja2
   - mslex
   - nodejs
+  - McStasScript
   - pip
-  - pip:
-    - guide_bot
-    - McStasScript
+

meta-pkgs/windows/environment.yml

@@ -32,7 +32,5 @@ dependencies:
   - typish
   - jsons
   - nodejs
+  - McStasScript
   - pip
-  - pip:
-    - guide_bot
-    - McStasScript

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