Skip to content

Commit

Permalink
Replace nexus with its dependencies
Browse files Browse the repository at this point in the history
Refs mantidproject#38332

The dependencies of https://github.com/conda-forge/nexus-feedstock/blob/main/recipe/meta.yaml
* hdf4 - added
* hdf5 - already present
* libjpeg-turbo - required by hdf4
* zlib - added
* libxml2 - required by libxslt
* ncurses - required by readline
* readline - required by python
  • Loading branch information
peterfpeterson committed Dec 5, 2024
1 parent e57bc9e commit 22b49de
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
5 changes: 3 additions & 2 deletions conda/recipes/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ doxygen:
eigen:
- 3.4.*

hdf4:
- 4.2.*

hdf5: # this is to move to libcurl>=8.4
- '>1.14.0,<1.15'

Expand All @@ -59,8 +62,6 @@ mkl:
muparser:
- '>=2.3.2'

nexus:
- 4.4.*
# We follow conda-forge and build with the lowest supported version of numpy for forward compatibility.
numpy:
- 2.0.*
Expand Down
3 changes: 2 additions & 1 deletion conda/recipes/mantid-developer/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ requirements:
- graphviz {{ graphviz }}
- gsl {{ gsl }}
- h5py
- hdf4 {{ hdf4 }}
- hdf5 {{ hdf5 }}
- jemalloc {{ jemalloc }} # [linux]
- jsoncpp {{ jsoncpp }}
Expand All @@ -27,7 +28,6 @@ requirements:
- matplotlib {{ matplotlib }}
- mkl {{ mkl }} # [win]
- muparser {{ muparser }}
- nexus {{ nexus }}
- ninja {{ ninja }}
- numpy>=2.0,<2.2 # This is intentionally different to conda_build_config.yaml, will address later.
- occt {{ occt }}
Expand Down Expand Up @@ -56,6 +56,7 @@ requirements:
- texlive-core {{ texlive_core }} # [osx or linux]
- toml {{ toml }}
- versioningit {{ versioningit }}
- zlib
- joblib
- orsopy {{ orsopy }}

Expand Down
6 changes: 4 additions & 2 deletions conda/recipes/mantid/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ requirements:
host:
- eigen {{ eigen }}
- gsl {{ gsl }}
- hdf4 {{ hdf4 }}
- h5py
- hdf5 {{ hdf5 }}
- jemalloc {{ jemalloc }} # [osx or linux]
Expand All @@ -45,7 +46,6 @@ requirements:
- lib3mf # [win]
- mkl {{ mkl }} # [win]
- muparser {{ muparser }}
- nexus {{ nexus }}
- numpy {{ numpy }}
- occt {{ occt }}
- python {{ python }}
Expand All @@ -54,15 +54,16 @@ requirements:
- tbb-devel {{ tbb }}
- pip {{ pip }}
- versioningit {{ versioningit }}
- zlib
- libglu {{ libglu }} # [linux]
run:
- {{ pin_compatible("gsl", max_pin="x.x") }}
- {{ pin_compatible("hdf4", max_pin="x.x") }}
- h5py
- {{ pin_compatible("hdf5", max_pin="x.x") }}
- jemalloc {{ jemalloc }} # [osx or linux]
- lib3mf # [win]
- mkl {{ mkl }} # [win]
- nexus {{ nexus }}
- {{ pin_compatible("numpy", upper_bound="2.2") }}
- occt {{ occt }}
- pycifrw
Expand All @@ -76,6 +77,7 @@ requirements:
- joblib
- orsopy {{ orsopy }}
- quasielasticbayes
- zlib
- pydantic

run_constrained:
Expand Down

0 comments on commit 22b49de

Please sign in to comment.