Merge pull request #36 from ie3-institute/ps/#35-harmonizePipeline

Harmonized Python CI pipelines

Author: danielfeismann

.github/workflows/simple-ci.yml renamed to .github/workflows/ci.yml

@@ -13,10 +13,10 @@ jobs:
       #----------------------------------------------
       #       check-out repo and set-up python
       #----------------------------------------------
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       #----------------------------------------------
       #        load pip cache if cache exists
       #----------------------------------------------
@@ -39,18 +39,21 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: ['ubuntu-latest', 'macos-latest']
+        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         python-version: ['3.11']
     runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
     steps:
       #----------------------------------------------
       #       check-out repo and set-up python
       #----------------------------------------------
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -70,22 +73,34 @@ jobs:
       #----------------------------------------------
       #       load cached venv if cache exists
       #----------------------------------------------
-      - name: Cache Poetry dependencies
-        uses: actions/cache@v3
+      - name: Cache Venv
+        continue-on-error: true
+        uses: actions/cache@v4
         with:
-          path: |
-            ~/.cache/pypoetry
-            .venv
-          key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+          path: .venv
+          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
           restore-keys: |
-            poetry-${{ runner.os }}-
+            venv-${{ runner.os }}-
       #----------------------------------------------
       # install dependencies if cache does not exist
       #----------------------------------------------
       - name: Install dependencies
         run: poetry install --no-interaction --no-root
 
-      - name: Run tests
+      - name: Run tests (Linux)
+        if: matrix.os == 'ubuntu-latest'
         run: |
           source .venv/bin/activate
-          pytest tests/
+          pytest tests/
+
+      - name: Run tests (macOS - skip Docker tests)
+        if: matrix.os == 'macos-latest'
+        run: |
+          source .venv/bin/activate
+          pytest tests/ -m "not docker_required"
+
+      - name: Run tests (Windows - skip Docker tests)
+        if: matrix.os == 'windows-latest'
+        run: |
+          source .venv/Scripts/activate
+          pytest tests/ -m "not docker_required"

CHANGELOG.md

@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 - Fix CI to set up postgres [#18](https://github.com/ie3-institute/psdm2pp/issues/18)
+- Harmonized CI OS-Matrix and updated Actions [#35](https://github.com/ie3-institute/psdm2pp/issues/35)
 
 ### Removed