Merge pull request #104 from neutrons/mantid_6_10

Update to mantid 6.10

.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: "*"

.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

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

docs/releasenotes/index.rst

@@ -12,6 +12,7 @@ Notes for major and minor releases. Notes for Patch releases are deferred.
 
 **Of interest to the User**:
 
+- PR #104: Update Mantid version to 6.10
 - PR #95: Optional dead-time correction (disabled by default)
 
 **Of interest to the Developer:**

environment.yml

@@ -1,10 +1,10 @@
 name: quicknxs
 channels:
-    - mantid/label/nightly
+    - mantid/label/main
     - conda-forge
     - default
 dependencies:
-- mantidworkbench>=6.8.20231103
+- mantidworkbench=6.10.0
 - anaconda-client
 - boa
 - build

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 =