Skip to content

Commit

Permalink
Merge pull request #37607 from robertapplin/0-pin-scipy-less-than-1-14
Browse files Browse the repository at this point in the history
Pin scipy <1.14 due to interp2d removal
  • Loading branch information
robertapplin committed Jun 25, 2024
2 parents d022724 + be0b9bf commit 1b00e0b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion conda/recipes/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ sphinx_bootstrap_theme:
- 0.8.1

scipy:
- '>=1.10.0'
- '>=1.10.0,<1.14'

pyqt:
- 5.15
Expand Down
2 changes: 1 addition & 1 deletion mantid-developer-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies:
- qt-gtk-platformtheme # Use native theme on GTK-based systems, which provides a significantly better performing file browser.
- quasielasticbayes
- requests>=2.25.1
- scipy>=1.10.0
- scipy>=1.10.0,<1.14
- setuptools
- sphinx>=4.5.*
- sphinx_bootstrap_theme>=0.8.1
Expand Down
2 changes: 1 addition & 1 deletion mantid-developer-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies:
- qtpy>=1.9.0
- quasielasticbayes
- requests>=2.25.1
- scipy>=1.10.0
- scipy>=1.10.0,<1.14
- setuptools
- sphinx>=4.5.*
- sphinx_bootstrap_theme>=0.8.1
Expand Down
2 changes: 1 addition & 1 deletion mantid-developer-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies:
- qtpy>=1.9.0
- quasielasticbayes
- requests>=2.25.1
- scipy>=1.10.0
- scipy>=1.10.0,<1.14
- setuptools
- sphinx>=4.5.*
- sphinx_bootstrap_theme>=0.8.1
Expand Down

0 comments on commit 1b00e0b

Please sign in to comment.