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
2 changes: 2 additions & 0 deletions buildconfig/Jenkins/build_and_publish_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ mamba install -c ${CONDA_LABEL} -c neutrons --yes mantid-developer mantidqt rsyn
rm -rf build
mkdir build && cd build

# unset LD_PRELOAD as this causes cmake to segfault
LD_PRELOAD="" \
# Generate build files
cmake -G Ninja \
-DMANTID_FRAMEWORK_LIB=SYSTEM \
Expand Down
3 changes: 3 additions & 0 deletions conda/recipes/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ sphinx_bootstrap_theme:
scipy:
- '>=1.10.0'

pillow:
- '<12.0.0'

pip:
- '>=21.0.1'

Expand Down
1 change: 1 addition & 0 deletions conda/recipes/mantid-developer/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ requirements:
- ninja ${{ ninja }}
- numpy ${{ numpy }}
- occt ${{ occt }}
- pillow ${{ pillow }}
- pip ${{ pip }}
- poco ${{ poco }}
- psutil ${{ psutil }}
Expand Down
1 change: 1 addition & 0 deletions conda/recipes/mantid/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ requirements:
- ${{ pin_subpackage('mantid', upper_bound='x.x.x') }}
run_constraints:
- matplotlib-base ${{ matplotlib }}
- pillow ${{ pillow }}
- pystog ${{ pystog }}

tests:
Expand Down