Skip to content

Commit

Permalink
Update mantid dependency to latest Mantid stable 6.11 (#15)
Browse files Browse the repository at this point in the history
* Update Mantid and MantidWorkbench versions to 6.11

Upgraded Mantid in conda.recipe meta.yaml from 6.8.0 to 6.11 and MantidWorkbench in environment.yml from 6.9.1 to 6.11. This ensures compatibility with the latest features and fixes provided in version 6.11.

Signed-off-by: Jose Borreguero <[email protected]>

* Update release notes with latest PR changes

This commit updates the release notes to include the latest changes from PR 15. It also corrects the order of previous PRs for better chronological tracking.

Signed-off-by: Jose Borreguero <[email protected]>

---------

Signed-off-by: Jose Borreguero <[email protected]>
  • Loading branch information
jmborr authored Oct 25, 2024
1 parent 41009bb commit c078ea8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ requirements:

run:
- python
- mantid=6.8.0
- mantid=6.11
- numpy
- scipy
- pandas
Expand Down
7 changes: 4 additions & 3 deletions docs/source/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ Release Notes

**Of interest to the Developer:**

- PR #14 transition from pip to conda when installing dependency finddata
- PR #13: Take average of intensity values with duplicate Q AND solve the issue with bg interpolation when bg q and sample q values are too close or identical
- PR #12: switch from mantid to mantidworkbench conda package
- PR 15: update Mantid dependency to 6.11
- PR 14: transition from pip to conda when installing dependency finddata
- PR 13: Take average of intensity values with duplicate Q AND solve the issue with bg interpolation when bg q and sample q values are too close or identical
- PR 12: switch from mantid to mantidworkbench conda package

1.0.0
-----
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
dependencies:
- python=3.10
- versioningit
- mantidworkbench=6.9.1
- mantidworkbench=6.11
- pandas
- xlsxwriter
- neutrons::finddata=0.10
Expand Down

0 comments on commit c078ea8

Please sign in to comment.