Use Mslice as conda package instead of an external interface

buildconfig/Jenkins/Conda/package-conda

@@ -142,7 +142,7 @@ if [[ $ENABLE_BUILD_WORKBENCH == true ]]; then
     if [[ $BUILD_WORKBENCH_WITH_DOCS == false ]]; then
 	export INCLUDE_MANTIDDOCS=False
     fi
-    conda mambabuild ./mantidworkbench/ $EXTRA_BUILD_OPTIONS
+    conda mambabuild ./mantidworkbench/ -c mantid/label/main $EXTRA_BUILD_OPTIONS
 fi
 
 # elapsed time with second resolution

conda/recipes/conda_build_config.yaml

@@ -68,6 +68,9 @@ numpy:
 matplotlib:
   - 3.8.*
 
+mslice:
+  - '2.10'
+
 ninja:
   - '>=1.10.2'
 

conda/recipes/mantidworkbench/meta.yaml

@@ -41,6 +41,7 @@ requirements:
     - psutil {{ psutil }}
     - {{ pin_compatible("python", max_pin="x.x") }}
     - matplotlib {{ matplotlib }}
+    - mslice {{ mslice }}
     - python.app  # [osx]
     - qtconsole {{ qtconsole }}
     - {{ pin_compatible("setuptools", max_pin="x.x") }}

dev-docs/source/ReleaseChecklist.rst

@@ -482,9 +482,6 @@ have been fixed. Then:
 * Check the release notes and verify that the "Under Construction" paragraph on the main
   index page has been removed. Remove the paragraph if it still exists.
 * Ensure that all changes, including release notes, have been merged into the ``release-next`` branch.
-* On the ``release-next`` branch, check whether the `git SHA
-  <https://github.com/mantidproject/mantid/blob/release-next/scripts/ExternalInterfaces/CMakeLists.txt>`__
-  for MSlice is up to date. If not, create a PR to update it and ask a gatekeeper to merge it.
 * Make sure the ``release-next`` branch is fully merged into ``main``. If required, manually run the `GitHub workflow
   <https://github.com/mantidproject/mantid/actions/workflows/automerge.yml/>`__ using the ``release-next`` branch to
   merge the changes.
@@ -525,7 +522,9 @@ Create Final Release Candidates
 ###############################
 
 Check with the Quality Assurance Manager that the Smoke testing has been completed, and any issues
-have been fixed. The release candidates must now be recreated with their final version numbers. To do this, build the
+have been fixed. Additionally, ensure that the version of the ``mslice`` package in ``conda_build_config.yaml`` is correct.
+If there have been any updates to MSlice since the last release, it must be released first. The release candidates must
+now be recreated with their final version numbers. To do this, build the
 `release-next_nightly_deployment Jenkins pipeline
 <https://builds.mantidproject.org/view/Nightly%20Pipelines/job/release-next_nightly_deployment/>`__
 with the following parameters (most are already defaulted to the correct values):

docs/source/release/v6.12.0/Direct_Geometry/MSlice/New_features/38299.rst

@@ -0,0 +1 @@
+- MSlice is now installed via Conda as part of Mantid workbench and not compiled as an external project anymore.

installers/conda/linux/create_tarball.sh

@@ -134,7 +134,7 @@ bundle_conda_prefix="$bundle_contents"
 
 echo "Creating Conda environment in '$bundle_conda_prefix'"
 "$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy \
-  --channel "$conda_channel" --channel conda-forge --yes \
+  --channel "$conda_channel" --channel conda-forge --channel mantid --yes \
   mantidworkbench \
   jq  # used for processing the version string
 echo

installers/conda/osx/create_bundle.sh

@@ -203,7 +203,7 @@ bundle_conda_prefix="$bundle_contents"/Resources
 
 echo "Creating Conda environment in '$bundle_conda_prefix'"
 "$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy --platform osx-64 \
-  --channel "$conda_channel" --channel conda-forge --yes \
+  --channel "$conda_channel" --channel conda-forge --channel mantid --yes \
   mantidworkbench \
   jq  # used for processing the version string
 echo

installers/conda/win/create_package.sh

@@ -74,7 +74,7 @@ mkdir $COPY_DIR
 
 echo "Creating conda env from mantidworkbench and jq"
 "$CONDA_EXE" create --prefix $CONDA_ENV_PATH \
-  --copy --channel $CONDA_CHANNEL --channel conda-forge -y \
+  --copy --channel $CONDA_CHANNEL --channel conda-forge --channel mantid -y \
   mantidworkbench \
   m2w64-jq
 echo "Conda env created"
@@ -170,7 +170,7 @@ rm -f $THIS_SCRIPT_DIR/uninstall_files.nsh
 rm -f $THIS_SCRIPT_DIR/uninstall_dirs.nsh
 
 echo "Creating nsis conda env"
-"$CONDA_EXE" create --prefix $NSIS_CONDA_ENV_PATH nsis -c conda-forge -y
+"$CONDA_EXE" create --prefix $NSIS_CONDA_ENV_PATH nsis -c conda-forge --channel mantid -y
 echo "Conda nsis env created"
 
 NSIS_SCRIPT=$THIS_SCRIPT_DIR/project.nsi

qt/python/mantidqtinterfaces/mantidqtinterfaces/MSlice.py

@@ -1,15 +1,23 @@
 #!/usr/bin/python
 # Mantid Repository : https://github.com/mantidproject/mantid
 #
-# Copyright © 2018 ISIS Rutherford Appleton Laboratory UKRI,
+# Copyright © 2024 ISIS Rutherford Appleton Laboratory UKRI,
 #   NScD Oak Ridge National Laboratory, European Spallation Source,
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
 import sys
-from mslice.app import show_gui
 from mantidqt.gui_helper import get_qapplication
 
-app, within_mantid = get_qapplication()
-show_gui()
-if not within_mantid:
-    sys.exit(app.exec_())
+try:
+    from mslice.app import show_gui
+except ImportError:
+    from mantid.kernel import logger
+
+    logger.warning("MSlice is not available")
+    show_gui = None
+
+if show_gui is not None:
+    app, within_mantid = get_qapplication()
+    show_gui()
+    if not within_mantid:
+        sys.exit(app.exec_())

scripts/CMakeLists.txt

@@ -1,6 +1,3 @@
-# External GUIs
-add_subdirectory(ExternalInterfaces)
-
 # External projects
 include(PyStoG)
 
@@ -29,8 +26,6 @@ foreach(_dir ${_pth_dirs})
   list(APPEND _pth_list_install "${_scripts_rel_path}/${_dir}")
 endforeach()
 list(APPEND _pth_list_dev ${CMAKE_CURRENT_BINARY_DIR})
-list(APPEND _pth_list_dev ${MSLICE_DEV})
-list(APPEND _pth_list_install "${_scripts_rel_path}/ExternalInterfaces")
 
 # development copy
 set(_scripts_pth_src "${CMAKE_CURRENT_BINARY_DIR}/mantid-scripts.pth.src")