Merge pull request #47 from pythonhealthdatascience/dev

Dev

Author: amyheather

.github/workflows/tests.yaml

@@ -1,42 +1,45 @@
-# This file runs the tests in `tests/`
-# They will run in parallel, and run on three operating systems:
-# Ubuntu, Windows and Mac.
-
 name: tests
 
 on:
   push:
     branches: [main]
   workflow_dispatch:
+    inputs:
+      operating_systems:
+        description: 'Operating systems to test on'
+        type: choice
+        default: 'all'
+        options:
+          - all
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
 
 jobs:
-
-  # Run tests on Ubuntu
-  tests-on-ubuntu:
+  # Generate matrix based on input
+  setup-matrix:
     runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-
-      - name: Check out repository
-        uses: actions/checkout@v4
-
-      - name: Install python and dependencies
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.13'
-          cache: 'pip'
-      - run: pip install -r requirements.txt
-
-      - name: Run tests
-        run: pytest
-
-      - name: List the environment variables
-        run: env
-
-  # Run tests on Windows
-  tests-on-windows:
-    runs-on: windows-latest
+      - name: Set matrix
+        id: set-matrix
+        run: |
+          if [[ "${{ inputs.operating_systems }}" == "all" || "${{ github.event_name }}" == "push" ]]; then
+            echo 'matrix=["ubuntu-latest", "windows-latest", "macos-latest"]' >> $GITHUB_OUTPUT
+          else
+            echo 'matrix=["${{ inputs.operating_systems }}"]' >> $GITHUB_OUTPUT
+          fi
+
+  # Run tests using matrix strategy
+  tests:
+    needs: setup-matrix
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ${{ fromJSON(needs.setup-matrix.outputs.matrix) }}
+    
     steps:
-
       - name: Check out repository
         uses: actions/checkout@v4
 
@@ -45,31 +48,17 @@ jobs:
         with:
           python-version: '3.13'
           cache: 'pip'
-      - run: python -m pip install -r requirements.txt
+      
+      - name: Install requirements (Windows)
+        if: runner.os == 'Windows'
+        run: python -m pip install -r requirements.txt
+      
+      - name: Install requirements (Unix)
+        if: runner.os != 'Windows'
+        run: pip install -r requirements.txt
 
       - name: Run tests
         run: pytest
 
       - name: List the environment variables
         run: env
-
-  # Run tests on Mac
-  tests-on-macos:
-    runs-on: macos-latest
-    steps:
-
-      - name: Check out repository
-        uses: actions/checkout@v4
-
-      - name: Install python and dependencies
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.13'
-          cache: 'pip'
-      - run: pip install -r requirements.txt
-
-      - name: Run tests
-        run: pytest
-
-      - name: List the environment variables
-        run: env

CITATION.cff

@@ -20,7 +20,7 @@ authors:
     affiliation: University of Exeter
     orcid: 'https://orcid.org/0000-0003-2631-4481'
 repository-code: >-
-  https://github.com/pythonhealthdatascience/rap_template_python_des
+  https://github.com/pythonhealthdatascience/pydesrap_mms
 abstract: >-
   A template for creating discrete-event simulation (DES) models in Python
   within a reproducible analytical pipeline (RAP).