From 32531f8fdaa3867f223822aa990581ff7f251841 Mon Sep 17 00:00:00 2001
From: "Patrou, Maria" <patroum@ornl.gov>
Date: Thu, 18 Jul 2024 16:26:44 -0400
Subject: [PATCH 1/5] mantid and pyre pinned versions as requirements

---
 pyproject.toml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0e0ce36..b017f1b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,9 @@ requires = [
   "toml",
   "versioningit",
   "numpy >= 1.20.3, <2.0",
-  "scipy >= 1.9.0, < 1.14.0"
+  "scipy >= 1.9.0, < 1.14.0",
+  "mantid == 6.4",
+  "pyre == 0.8.3"
 ]
 build-backend = "setuptools.build_meta"
 

From 661ba4af2d9cfb2113ba1ca26cd716550c6dc98b Mon Sep 17 00:00:00 2001
From: "Patrou, Maria" <patroum@ornl.gov>
Date: Thu, 18 Jul 2024 16:38:11 -0400
Subject: [PATCH 2/5] dependencies added

---
 pyproject.toml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b017f1b..e452997 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,10 @@ description="Multiphonon scattering and multiple scattering correction for powde
 dynamic = ["version"]
 requires-python = ">=3.8"
 dependencies = [
-  # list all runtime dependencies here
+  "numpy >= 1.20.3, <2.0",
+  "scipy >= 1.9.0, < 1.14.0",
+  "mantid == 6.4",
+  "pyre == 0.8.3"
 ]
 license = { text = "BSD" }
 keywords= ["neutron, inelastic neutron scattering, powder, phonon"]
@@ -18,10 +21,6 @@ requires = [
   "wheel",
   "toml",
   "versioningit",
-  "numpy >= 1.20.3, <2.0",
-  "scipy >= 1.9.0, < 1.14.0",
-  "mantid == 6.4",
-  "pyre == 0.8.3"
 ]
 build-backend = "setuptools.build_meta"
 

From d1983787f7b503c29ae50b4ee2378dc070f98723 Mon Sep 17 00:00:00 2001
From: "Patrou, Maria" <patroum@ornl.gov>
Date: Thu, 18 Jul 2024 17:04:23 -0400
Subject: [PATCH 3/5] channel reordering

---
 environment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index 43802e5..0ac72b6 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,9 +2,9 @@
 #Note: Use this
 name: multiphonon
 channels:
-  - conda-forge
-  - mcvine
   - mantid
+  - mcvine
+  - conda-forge
 dependencies:
   #- anaconda-client
   #- boa

From 2b607674b9cd03349a2f8c0cdfa058600c4a763d Mon Sep 17 00:00:00 2001
From: "Patrou, Maria" <patroum@ornl.gov>
Date: Fri, 19 Jul 2024 09:06:59 -0400
Subject: [PATCH 4/5] include the dependecies that can be resolved

---
 conda.recipe/meta.yaml | 2 ++
 pyproject.toml         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index da55e04..ff18538 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -37,9 +37,11 @@ requirements:
   run:
     - numpy
     - histogram
+    - pyre
     - scipy
     - matplotlib
     - mantid
+    - ipywe
 
   test:
     imports:
diff --git a/pyproject.toml b/pyproject.toml
index e452997..b6dea6e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ dependencies = [
   "numpy >= 1.20.3, <2.0",
   "scipy >= 1.9.0, < 1.14.0",
   "mantid == 6.4",
-  "pyre == 0.8.3"
+  "ipywe == 0.1.3a1"
 ]
 license = { text = "BSD" }
 keywords= ["neutron, inelastic neutron scattering, powder, phonon"]

From a90599014d59afd0fcb68978120b5720b396013f Mon Sep 17 00:00:00 2001
From: "Patrou, Maria" <patroum@ornl.gov>
Date: Fri, 19 Jul 2024 10:21:50 -0400
Subject: [PATCH 5/5] channel reordering

---
 conda_environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda_environment.yml b/conda_environment.yml
index 2544c53..a78282d 100644
--- a/conda_environment.yml
+++ b/conda_environment.yml
@@ -2,9 +2,9 @@
 #Only use for building a conda package: conda mambabuild
 name: multiphonon_conda_build_only
 channels:
-  - conda-forge
   - mantid
   - mcvine
+  - conda-forge
 dependencies:
   - anaconda-client
   - boa