Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion conda/recipes/mantidworkbench/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,15 @@ requirements:
- psutil {{ psutil }}
- {{ pin_compatible("python", max_pin="x.x") }}
- matplotlib {{ matplotlib }}
- mslice {{ mslice }}
- python.app # [osx]
- pystack # [linux]
- qtconsole {{ qtconsole }}
- {{ pin_compatible("setuptools", max_pin="x.x") }}
{% if environ.get('INCLUDE_MANTIDDOCS', 'True') != 'False' %}
- mantiddocs {{ version }}
{% endif %}
run_constrained:
- mslice {{ mslice }}

test:
imports:
Expand Down
2 changes: 2 additions & 0 deletions dev-docs/source/Testing/Direct/MSliceTestGuide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Set Up
------

#. Ensure you have the `ISIS Sample Data <http://download.mantidproject.org>`__ available on your machine.
#. 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.
#. If you are using a standalone install of Mantid Workbench, MSlice should already be available within it.
#. Open ``Interfaces`` > ``Direct`` > ``MSlice``
#. Go to the ``Data Loading`` tab and select ``MAR21335_Ei60meV.nxs`` from the sample data.
#. Click ``Load Data``
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +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.
1 change: 1 addition & 0 deletions installers/conda/linux/create_tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ echo "Creating conda environment in '$bundle_conda_prefix'"
"$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy \
--channel "$conda_channel" --channel conda-forge --channel $mantid_channel --yes \
mantidworkbench \
mslice \
jq # used for processing the version string
echo

Expand Down
1 change: 1 addition & 0 deletions installers/conda/osx/create_bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ echo "Creating conda environment in '$bundle_conda_prefix'"
CONDA_SUBDIR="$platform" "$CONDA_EXE" create --quiet --prefix "$bundle_conda_prefix" --copy \
--channel "$conda_channel" --channel conda-forge --channel $mantid_channel --yes \
mantidworkbench \
mslice \
jq # used for processing the version string
echo

Expand Down
1 change: 1 addition & 0 deletions installers/conda/win/create_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ echo "Creating conda env from mantidworkbench and jq"
"$CONDA_EXE" create --prefix $CONDA_ENV_PATH \
--copy --channel $CONDA_CHANNEL --channel conda-forge --channel $MANTID_CHANNEL -y \
mantidworkbench \
mslice \
m2w64-jq
echo "Conda env created"

Expand Down