Skip to content

Commit f793fbd

Browse files
committed
Pin freeimage in conda environments
A recent build variant update has caused a lot of test failures. This is not a primary dependency (it's brought in by occt).
1 parent c581f90 commit f793fbd

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

conda/recipes/conda_build_config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ doxygen:
3636
eigen:
3737
- 3.4.*
3838

39+
# This is not a primary dependency, but we need to pin to this build variant to avoid failures.
40+
freeimage:
41+
- '=3.18.0=*_21'
42+
3943
hdf5: # this is to move to libcurl>=8.4
4044
- '>1.14.0,<1.15'
4145

conda/recipes/mantid-developer/meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ requirements:
1212
- doxygen {{ doxygen }}
1313
- eigen {{ eigen }}
1414
- euphonic {{ euphonic }}
15+
- freeimage {{ freeimage }} # This is not a primary dependency, but we need to pin it to avoid failures.
1516
- graphviz {{ graphviz }}
1617
- gsl {{ gsl }}
1718
- h5py

conda/recipes/mantid/meta.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ requirements:
3333

3434
host:
3535
- eigen {{ eigen }}
36+
- freeimage {{ freeimage }} # This is not a primary dependency, but we need to pin it to avoid failures.
3637
- gsl {{ gsl }}
3738
- h5py
3839
- hdf5 {{ hdf5 }}
@@ -55,6 +56,7 @@ requirements:
5556
- versioningit {{ versioningit }}
5657
- libglu {{ libglu }} # [linux]
5758
run:
59+
- freeimage {{ freeimage }} # This is not a primary dependency, but we need to pin it to avoid failures.
5860
- {{ pin_compatible("gsl", max_pin="x.x") }}
5961
- h5py
6062
- {{ pin_compatible("hdf5", max_pin="x.x") }}

0 commit comments

Comments
 (0)