Re-use and re-instate the Action file

JamesParrott · Sep 17, 2024 · 658f30c · 658f30c
1 parent 6b62dc6
commit 658f30c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 36 deletions.
diff --git a/.github/workflows/actions/test/action.yml b/.github/workflows/actions/test/action.yml
@@ -0,0 +1,29 @@
+name:
+  Test
+
+description:
+  Run pytest, and run the doctest runner (shapefile.py as a script).
+
+runs:
+  using: "composite"
+  steps:
+    # The Repo is required to already be checked out, e.g. by the calling workflow
+
+    # The Python to be tested with is required to already be setup, with "python" and "pip" on the system Path
+
+    - name: Doctests
+      run: python shapefile.py
+
+    - name: Install test dependencies.
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.test.txt
+
+    - name: Pytest
+      run: |
+        pytest
+
+    - name: Show versions for logs.
+      run: |
+        python --version
+        python -m pytest --version
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,27 +40,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-
-    - name: Doctests
-      run: python shapefile.py
-
-    - name: Install test dependencies.
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.test.txt
-
-    - name: Pytest
-      run: |
-        pytest
-
-    - name: Show versions for logs.
-      run: |
-        python --version
-        python -m pytest --version
+    - name: Run tests
+      uses: ./.github/actions/test
 
 
   test_on_MacOS_and_Windows:
-
     strategy:
       fail-fast: false
       matrix:
@@ -71,14 +55,12 @@ jobs:
           "macos-latest",
           "windows-latest",
         ]
-
         # include:
         #   - os: "windows-latest"
         #     python-version: "3.13"
         #   - os: "macos-latest"
         #     python-version: "3.13"
 
-
     runs-on: matrix.os
     steps:
     - uses: actions/checkout@v4
@@ -87,19 +69,5 @@ jobs:
       with:
         python-version: ${{ inputs.python_version }}
 
-    - name: Doctests
-      run: python shapefile.py
-
-    - name: Install test dependencies.
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.test.txt
-
-    - name: Pytest
-      run: |
-        pytest
-
-    - name: Show versions for logs.
-      run: |
-        python --version
-        python -m pytest --version
+    - name: Run tests
+      uses: ./.github/actions/test