diff --git a/buildconfig/Jenkins/build_and_publish_docs.sh b/buildconfig/Jenkins/build_and_publish_docs.sh index f692319c0d5e..4fdfc9000563 100755 --- a/buildconfig/Jenkins/build_and_publish_docs.sh +++ b/buildconfig/Jenkins/build_and_publish_docs.sh @@ -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 \ diff --git a/conda/recipes/conda_build_config.yaml b/conda/recipes/conda_build_config.yaml index 05da5ca46c29..f2c9eaae5b05 100644 --- a/conda/recipes/conda_build_config.yaml +++ b/conda/recipes/conda_build_config.yaml @@ -102,6 +102,9 @@ sphinx_bootstrap_theme: scipy: - '>=1.10.0' +pillow: + - '<12.0.0' + pip: - '>=21.0.1' diff --git a/conda/recipes/mantid-developer/recipe.yaml b/conda/recipes/mantid-developer/recipe.yaml index 69a998e85c4e..38aa45e98aef 100644 --- a/conda/recipes/mantid-developer/recipe.yaml +++ b/conda/recipes/mantid-developer/recipe.yaml @@ -32,6 +32,7 @@ requirements: - ninja ${{ ninja }} - numpy ${{ numpy }} - occt ${{ occt }} + - pillow ${{ pillow }} - pip ${{ pip }} - poco ${{ poco }} - psutil ${{ psutil }} diff --git a/conda/recipes/mantid/recipe.yaml b/conda/recipes/mantid/recipe.yaml index 3517f3e83c29..456359fc72a0 100644 --- a/conda/recipes/mantid/recipe.yaml +++ b/conda/recipes/mantid/recipe.yaml @@ -97,6 +97,7 @@ requirements: - ${{ pin_subpackage('mantid', upper_bound='x.x.x') }} run_constraints: - matplotlib-base ${{ matplotlib }} + - pillow ${{ pillow }} - pystog ${{ pystog }} tests: