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: 0 additions & 3 deletions conda/recipes/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ hdf5:
gsl:
- 2.7

ipykernel:
- <6

# 16 causing build errors on osx, seems incompatible with our version of boost.
libcxx:
- <16
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/mantidworkbench/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ requirements:
- python {{ python }}
- versioningit
run:
- ipykernel {{ ipykernel }}
- ipykernel
- psutil
- {{ pin_compatible("python", max_pin="x.x") }}
- matplotlib {{ matplotlib }}
Expand Down
1 change: 0 additions & 1 deletion mantid-developer-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ dependencies:
- gsl=2.7 # Keep gsl a specific version to reduce changes in our fitting
- h5py
- hdf5>=1.12,<1.13
- ipykernel<6 # Added as hard dependency only to deal with an issue with ipykernel v6 and incompatibility with qtconsole/workbench, was previously a soft dependency that was allowed to update to v6 by qtconsole, at present it stops workbench from loading.
- jemalloc=5.2.0 # We have noticed 5.2.1 can cause a hang on older glibc versions (Cent OS 7, Ubuntu 18.04). Observed with import CaChannel and also our MeierTest.
- jsoncpp>=1.9.4,<2
- librdkafka>=1.6.0
Expand Down
1 change: 0 additions & 1 deletion mantid-developer-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ dependencies:
- gsl=2.7 # Keep gsl a specific version to reduce changes in our fitting
- h5py
- hdf5>=1.12,<1.13
- ipykernel<6 # Added as hard dependency only to deal with an issue with ipykernel v6 and incompatibility with qtconsole/workbench, was previously a soft dependency that was allowed to update to v6 by qtconsole, at present it stops workbench from loading.
- jemalloc>=5.2.1
- jsoncpp>=1.9.4,<2
- librdkafka>=1.6.0
Expand Down
1 change: 0 additions & 1 deletion mantid-developer-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ dependencies:
- gsl=2.7 # Keep gsl a specific version to reduce changes in our fitting
- h5py
- hdf5>=1.12,<1.13
- ipykernel<6 # Added as hard dependency only to deal with an issue with ipykernel v6 and incompatibility with qtconsole/workbench, was previously a soft dependency that was allowed to update to v6 by qtconsole, at present it stops workbench from loading.
- jsoncpp>=1.9.4,<2
- librdkafka>=1.6.0
- lib3mf # windows only
Expand Down