From c078ea84f5a3177801554a374b9d771f56d0226a Mon Sep 17 00:00:00 2001 From: Jose Borreguero Date: Fri, 25 Oct 2024 13:44:29 -0400 Subject: [PATCH] Update mantid dependency to latest Mantid stable 6.11 (#15) * 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 * 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 --------- Signed-off-by: Jose Borreguero --- conda.recipe/meta.yaml | 2 +- docs/source/releases.rst | 7 ++++--- environment.yml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 50c9943..90d42ba 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -35,7 +35,7 @@ requirements: run: - python - - mantid=6.8.0 + - mantid=6.11 - numpy - scipy - pandas diff --git a/docs/source/releases.rst b/docs/source/releases.rst index e778e48..076596a 100644 --- a/docs/source/releases.rst +++ b/docs/source/releases.rst @@ -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 ----- diff --git a/environment.yml b/environment.yml index 9f08ae1..137ae5b 100644 --- a/environment.yml +++ b/environment.yml @@ -6,7 +6,7 @@ channels: dependencies: - python=3.10 - versioningit - - mantidworkbench=6.9.1 + - mantidworkbench=6.11 - pandas - xlsxwriter - neutrons::finddata=0.10