From 8ee3b8508c9e5ec6b38c49b4566b786ba3628a77 Mon Sep 17 00:00:00 2001
From: Hannah Lanzrath <h.lanzrath@fz-juelich.de>
Date: Tue, 18 Mar 2025 15:10:48 +0100
Subject: [PATCH 1/2] Update CI to other OS and use Conda

---
 .github/workflows/pipeline.yml | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 898eae8..3c5f8c0 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   test-job:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     defaults:
       run:
@@ -17,7 +17,14 @@ jobs:
 
     strategy:
       matrix:
+        os: [ubuntu-latest]
         python-version: ["3.10", "3.11", "3.12"]
+        include:
+          - os: windows-latest
+            python-version: "3.12"
+          - os: macos-13
+            python-version: "3.12"
+
     steps:
       - uses: actions/checkout@v4
 
@@ -32,7 +39,7 @@ jobs:
           miniforge-version: latest
           use-mamba: true
           activate-environment: cadet-python
-          channels: conda-forge,
+          channels: conda-forge
 
       - name: Cache conda
         uses: actions/cache@v3
@@ -41,26 +48,29 @@ jobs:
           CACHE_NUMBER: 0
         with:
           path: ${{ env.CONDA }}/envs
-          key: python_${{ matrix.python-version }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}
+          key: ${{ matrix.os }}-python_${{ matrix.python-version }}-${{ steps.get-date.outputs.today }}-${{ hashFiles(env.CONDA_FILE) }}-${{ env.CACHE_NUMBER }}
+        id: cache
 
       - name: Set up python env
         run: |
-          mamba install python==${{ matrix.python-version }}
-          pip install .
+          conda install python=${{ matrix.python-version }}
+          conda run pip install .
+
       - name: Install pypa/build
         run: |
-          python -m pip install build --user
+          conda run python -m pip install build --user
 
       - name: Build binary wheel and source tarball
         run: |
-          python -m build --sdist --wheel --outdir dist/ .
+          conda run python -m build --sdist --wheel --outdir dist/ .
 
       - name: Test Wheel install and import
         run: |
-          python -c "import cadet; print(cadet.__version__)"
+          conda run python -c "import cadet; print(cadet.__version__)"
           cd ..
+
       - name: Test with pytest
         run: |
-          pip install .[testing]
-          mamba install -c conda-forge cadet>=5.0.3
+          conda run pip install .[testing]
+          conda install -c conda-forge cadet>=5.0.3
           pytest tests --rootdir=tests -m "not slow and not local"

From b5e076f76418e70294ff656a8997e377ba8c6840 Mon Sep 17 00:00:00 2001
From: Hannah Lanzrath <h.lanzrath@fz-juelich.de>
Date: Tue, 18 Mar 2025 15:35:29 +0100
Subject: [PATCH 2/2] Add MacOs to resolve cadet paths

---
 cadet/cadet.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cadet/cadet.py b/cadet/cadet.py
index ab83c1a..bc7607e 100644
--- a/cadet/cadet.py
+++ b/cadet/cadet.py
@@ -87,6 +87,9 @@ def resolve_cadet_paths(
     if platform.system() == 'Windows':
         dll_path = cadet_root / 'bin' / 'cadet.dll'
         dll_debug_path = cadet_root / 'bin' / 'cadet_d.dll'
+    elif platform.system() == 'Darwin':
+        dll_path = cadet_root / 'lib' / 'libcadet.dylib'
+        dll_debug_path = cadet_root / 'lib' / 'libcadet_d.dylib'
     else:
         dll_path = cadet_root / 'lib' / 'libcadet.so'
         dll_debug_path = cadet_root / 'lib' / 'libcadet_d.so'