From 56b540b9c1120bf5f0b776332277a4e930b79c65 Mon Sep 17 00:00:00 2001
From: Martin Lang <martin.lang@mpsd.mpg.de>
Date: Mon, 8 Jun 2026 16:40:50 +0200
Subject: [PATCH 1/4] Update pre-commit hooks

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 493580e..ca0748b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,14 +2,14 @@ exclude: 'dev'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   - id: check-merge-conflict  # checks for files that contain merge conflict strings
   - id: check-toml  # checks toml files for parseable syntax
   - id: debug-statements  # checks for debugger imports and py37+ `breakpoint()` calls in python source
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.0
+  rev: v0.15.15
   hooks:
     # Run the linter.
     - id: ruff

From 7bad29296a5988b0ebb74fd6dbb020e84450ffe9 Mon Sep 17 00:00:00 2001
From: Martin Lang <martin.lang@mpsd.mpg.de>
Date: Mon, 8 Jun 2026 16:41:15 +0200
Subject: [PATCH 2/4] Exclude python-basics notebook from pre-commit

Contains intentionally broken code
---
 .pre-commit-config.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ca0748b..0d67cef 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,8 +17,7 @@ repos:
       args: 
         - --fix
         - --exit-non-zero-on-fix
-        - --per-file-ignores
-        - getting-started/python-basics.ipynb:E999
+      exclude: getting-started/python-basics.ipynb
 
     # Run the formatter.
     - id: ruff-format

From 60abddf3410cbb7eadc92335e3b26ef14a7ca76f Mon Sep 17 00:00:00 2001
From: Martin Lang <martin.lang@mpsd.mpg.de>
Date: Mon, 8 Jun 2026 16:44:21 +0200
Subject: [PATCH 3/4] Update CI config

---
 .github/workflows/{workflow.yml => test.yml} | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
 rename .github/workflows/{workflow.yml => test.yml} (84%)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/test.yml
similarity index 84%
rename from .github/workflows/workflow.yml
rename to .github/workflows/test.yml
index 59beb8f..ffee077 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,10 @@
-name: workflow
+name: tests
 
 on:
   push:
+    branches:
+      - master
+  pull_request:
   schedule:
     - cron: '0 0 * * 1'  # run every Monday
   workflow_dispatch:
@@ -10,11 +13,11 @@ env:
   PYTEST_ADDOPTS: "--color=yes"
 
 jobs:
-  workflow:
+  tests:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-26-intel, windows-latest]
     defaults:
       run:
         shell: bash -l {0}
@@ -24,14 +27,12 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Set up conda
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
+        python-version: 3.13
         auto-update-conda: true
         activate-environment: conda-environment
         environment-file: .github/environment.yml
-        miniforge-version: latest
-        miniforge-variant: Mambaforge
-        use-mamba: true
 
     # The first import (of discretisedfield) on Windows produces a failure in the notebook tests
     # (output mismatch) because of some (hidden) message on stderr (some IO error on Windows that

From b28f67b2a45778152b5acee92413ab60ff286d83 Mon Sep 17 00:00:00 2001
From: Martin Lang <martin.lang@mpsd.mpg.de>
Date: Mon, 8 Jun 2026 16:50:27 +0200
Subject: [PATCH 4/4] Remove python pinning in CI environment.yml

---
 .github/environment.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/environment.yml b/.github/environment.yml
index 570b1e9..d09ebd9 100644
--- a/.github/environment.yml
+++ b/.github/environment.yml
@@ -4,7 +4,6 @@ channels:
   - conda-forge
 
 dependencies:
-  - python==3.10
   - pip
   - oommf
   - pytest