From d9995f4c24bc0e146d506743d8010a3be15d13c0 Mon Sep 17 00:00:00 2001 From: hetrickjm Date: Wed, 21 May 2025 16:51:05 -0400 Subject: [PATCH] Pinned the mantid-ornl version Change from mantidnightly to the latest version of mantid-ornl. Also, made sure the version of mantid was pinned so it would not accidently resolve to an old version --- scd-reduction-tools-dev.yml | 5 +++-- scd-reduction-tools-qa.yml | 4 ++-- scd-reduction-tools.yml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scd-reduction-tools-dev.yml b/scd-reduction-tools-dev.yml index 5b7d8f6..3f911f5 100644 --- a/scd-reduction-tools-dev.yml +++ b/scd-reduction-tools-dev.yml @@ -3,12 +3,12 @@ name: scd-reduction-tools-dev channels: - - mantid/label/nightly + - mantid-ornl - conda-forge - defaults dependencies: - - mantid + - mantid=6.12.0.2 - numpy - pycifrw - gemmi @@ -28,6 +28,7 @@ dependencies: - dill - psutil - multiprocess + - pip - pip: - pyqtdarktheme diff --git a/scd-reduction-tools-qa.yml b/scd-reduction-tools-qa.yml index 940de9c..b09bb65 100644 --- a/scd-reduction-tools-qa.yml +++ b/scd-reduction-tools-qa.yml @@ -3,12 +3,12 @@ name: scd-reduction-tools-qa channels: - - mantid/label/nightly + - mantid-ornl - conda-forge - defaults dependencies: - - mantid + - mantid=6.12.0.2 - numpy - pycifrw - matplotlib diff --git a/scd-reduction-tools.yml b/scd-reduction-tools.yml index 6197468..ed8db5e 100644 --- a/scd-reduction-tools.yml +++ b/scd-reduction-tools.yml @@ -3,12 +3,12 @@ name: scd-reduction-tools channels: - - mantid/label/nightly + - mantid-ornl - conda-forge - defaults dependencies: - - mantid + - mantid=6.12.0.2 - numpy - pycifrw - matplotlib -- GitLab