From b43d80b9bbbcad427fba543b655140175a76e3a1 Mon Sep 17 00:00:00 2001
From: Marie Backman <backmanma@ornl.gov>
Date: Tue, 13 Aug 2024 13:46:15 -0400
Subject: [PATCH] update mantid version in meta.yaml and setup.cfg

---
 .github/workflows/actions.yml | 2 +-
 .gitignore                    | 2 --
 conda.recipe/meta.yaml        | 2 +-
 setup.cfg                     | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index a169e1e6..46e9f630 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: conda-incubator/setup-miniconda@v2
         with:
-          channels: mantid/label/nightly,conda-forge,defaults
+          channels: mantid/label/main,conda-forge,defaults
           python-version: '3.10'
           miniconda-version: latest
           mamba-version: "*"
diff --git a/.gitignore b/.gitignore
index 4bd3a08d..d88bf1ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ __pycache__/
 .Python
 env/
 build/
-conda.recipe/
 develop-eggs/
 dist/
 downloads/
@@ -25,7 +24,6 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
-conda.recipe/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 71ac2a53..869d813c 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -34,7 +34,7 @@ requirements:
     - versioningit
 
   run:
-    - mantid>=6.8.20231103
+    - mantid=6.10.0
     - matplotlib
     - qtpy
     - qt>=5.12,<6
diff --git a/setup.cfg b/setup.cfg
index b7967cbf..fbc28043 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ include_package_data = True
 python_requires >= 3.10
 packages = find:
 install_requires =
-    mantid>=6.7
+    mantid>=6.10
     matplotlib
     qtpy
 tests_require =