Skip to content

Commit c87b23b

Browse files
MSlice is made and optional dependency of mantidworkbench for conda installs (mantidproject#39675)
MSlice is turned into an optional dependency of mantidworkbench. However, mslice would still be installed explicitly in IDAaaS and inside standalone packages.
1 parent 909c7c0 commit c87b23b

File tree

6 files changed

+8
-1
lines changed

6 files changed

+8
-1
lines changed

conda/recipes/mantidworkbench/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@ requirements:
4242
- psutil {{ psutil }}
4343
- {{ pin_compatible("python", max_pin="x.x") }}
4444
- matplotlib {{ matplotlib }}
45-
- mslice {{ mslice }}
4645
- python.app # [osx]
4746
- pystack # [linux]
4847
- qtconsole {{ qtconsole }}
4948
- {{ pin_compatible("setuptools", max_pin="x.x") }}
5049
{% if environ.get('INCLUDE_MANTIDDOCS', 'True') != 'False' %}
5150
- mantiddocs {{ version }}
5251
{% endif %}
52+
run_constrained:
53+
- mslice {{ mslice }}
5354

5455
test:
5556
imports:

dev-docs/source/Testing/Direct/MSliceTestGuide.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Set Up
1919
------
2020

2121
#. Ensure you have the `ISIS Sample Data <http://download.mantidproject.org>`__ available on your machine.
22+
#. If you are using a conda install of Mantid Workbench, make sure to install MSlice by running ``mamba install -c mantid mslice`` inside your conda enviroment and restart the Mantid Workbench.
23+
#. If you are using a standalone install of Mantid Workbench, MSlice should already be available within it.
2224
#. Open ``Interfaces`` > ``Direct`` > ``MSlice``
2325
#. Go to the ``Data Loading`` tab and select ``MAR21335_Ei60meV.nxs`` from the sample data.
2426
#. Click ``Load Data``
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- ``mslice`` is now an optional dependancy of the ``mantidworkbench`` conda package and must be explicitly installed when required in a conda environment. Full/standalone installers and IDAaaS installations remain unchanged; mslice will be automatically provided there.

installers/conda/linux/create_tarball.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ echo "Creating conda environment in '$bundle_conda_prefix'"
144144
"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy \
145145
--channel "$conda_channel" --channel conda-forge --channel $mantid_channel --yes \
146146
mantidworkbench \
147+
mslice \
147148
jq # used for processing the version string
148149
echo
149150

installers/conda/osx/create_bundle.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ echo "Creating conda environment in '$bundle_conda_prefix'"
218218
CONDA_SUBDIR="$platform" "$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy \
219219
--channel "$conda_channel" --channel conda-forge --channel $mantid_channel --yes \
220220
mantidworkbench \
221+
mslice \
221222
jq # used for processing the version string
222223
echo
223224

installers/conda/win/create_package.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ echo "Creating conda env from mantidworkbench and jq"
8484
"$CONDA_EXE" create --prefix $CONDA_ENV_PATH \
8585
--copy --channel $CONDA_CHANNEL --channel conda-forge --channel $MANTID_CHANNEL -y \
8686
mantidworkbench \
87+
mslice \
8788
m2w64-jq
8889
echo "Conda env created"
8990

0 commit comments

Comments
 (0)