From 6c77e6931c4d51e862648a9fb7f3dba94dbfc5f2 Mon Sep 17 00:00:00 2001
From: Jan-Lukas Wynen <jan-lukas.wynen@ess.eu>
Date: Tue, 24 Oct 2023 10:19:00 +0200
Subject: [PATCH] Use py 3.10 and mantid 6.8 in CI

---
 .buildconfig/ci-linux.yml         | 2 +-
 .buildconfig/ci-macos.yml         | 2 +-
 .buildconfig/ci-windows.yml       | 2 +-
 .github/workflows/pr_and_main.yml | 8 ++++----
 conda/meta.yaml                   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.buildconfig/ci-linux.yml b/.buildconfig/ci-linux.yml
index c6d82e97f..9b150cbdb 100644
--- a/.buildconfig/ci-linux.yml
+++ b/.buildconfig/ci-linux.yml
@@ -13,7 +13,7 @@ dependencies:
   - ipykernel==6.22.0
   - ipympl==0.9.3
   - ipywidgets==8.0.6
-  - mantid==6.6.0
+  - mantid==6.8.0
   - matplotlib==3.7.1
   - ninja==1.11.1
   - plopp==23.04.0
diff --git a/.buildconfig/ci-macos.yml b/.buildconfig/ci-macos.yml
index 0247af7c8..90e22288f 100644
--- a/.buildconfig/ci-macos.yml
+++ b/.buildconfig/ci-macos.yml
@@ -8,7 +8,7 @@ dependencies:
   - comm=0.1.3  # earlier versions break tests with ipywidgets with latest ipykernel
   - h5py==3.8.0
   - hypothesis==6.71.0
-  - mantid==6.6.0
+  - mantid==6.8.0
   - matplotlib==3.7.1
   - ninja==1.11.1
   - plopp==23.04.0
diff --git a/.buildconfig/ci-windows.yml b/.buildconfig/ci-windows.yml
index 9d96b950a..a2b69a410 100644
--- a/.buildconfig/ci-windows.yml
+++ b/.buildconfig/ci-windows.yml
@@ -8,7 +8,7 @@ dependencies:
   - comm=0.1.3  # earlier versions break tests with ipywidgets with latest ipykernel
   - h5py==3.8.0
   - hypothesis==6.71.0
-  - mantid==6.6.0
+  - mantid==6.8.0
   - matplotlib==3.7.1
   - ninja==1.11.1
   - plopp==23.04.0
diff --git a/.github/workflows/pr_and_main.yml b/.github/workflows/pr_and_main.yml
index 0d4653f23..831987c1f 100644
--- a/.github/workflows/pr_and_main.yml
+++ b/.github/workflows/pr_and_main.yml
@@ -40,7 +40,7 @@ jobs:
         - {os: ubuntu-20.04, build-config: ci-linux}
         - {os: macos-11, build-config: ci-macos}
         - {os: windows-2019, build-config: ci-windows}
-        python-version: ["3.8"]
+        python-version: ["3.10"]
 
     steps:
       - uses: actions/checkout@v3
@@ -64,14 +64,14 @@ jobs:
           python -m sphinx -j2 -v -b html -d doctrees docs html
           python -m sphinx -j2 -v -b doctest -d doctrees docs html
           find html -type f -name "*.ipynb" -not -path "html/_sources/*" -delete
-        if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.8' }}
+        if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.10' }}
 
       - run: python -m sphinx -j4 -v -b linkcheck -d doctrees docs html
         # Linkcheck can be flaky. Avoid randomly breaking PR builds by running only on `main`
-        if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.8' && github.ref == 'refs/heads/main' }}
+        if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.10' && github.ref == 'refs/heads/main' }}
 
       - uses: actions/upload-artifact@v3
-        if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.8' }}
+        if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.10' }}
         with:
           name: DocumentationHTML
           path: html/
diff --git a/conda/meta.yaml b/conda/meta.yaml
index d0c675bcc..e22a4b6a9 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -49,7 +49,7 @@ test:
     - pytest==7.3.0
     - pytest-asyncio==0.21.0
     - pythreejs==2.4.2
-    - mantid==6.6.0 [py==38]
+    - mantid==6.8.0 [py==310]
     - python-confluent-kafka==1.9.2 [linux64]
     - ess-streaming-data-types==v0.14.0 [linux64]
   source_files:
@@ -59,7 +59,7 @@ test:
 
 build:
   ignore_run_exports:
-    - mantid [py==38]
+    - mantid [py==310]
   noarch: python
   script:
     - python -m pip install .