reinstated separate singularity test job

Author: tclose

.github/workflows/ci-cd.yml

@@ -55,36 +55,6 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Set env for singularity
-        run: echo "RELEASE_VERSION=v3.7.1" >> $GITHUB_ENV
-      - name: Disable etelemetry
-        run:  echo "NO_ET=TRUE" >> $GITHUB_ENV
-      - name: Setup Singularity
-        uses: actions/checkout@v4
-        with:
-          repository: hpcng/singularity
-          ref: 'v3.7.1'
-          path: 'singularity'
-      - name: Setup GO
-        uses: actions/setup-go@v5
-        with:
-          go-version: '^1.13'
-      - name: Install OS deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install flawfinder squashfs-tools uuid-dev libuuid1 libffi-dev libssl-dev libssl1.1 \
-          libarchive-dev libgpgme11-dev libseccomp-dev wget gcc make pkg-config -y
-      - name: Build
-        run: |
-          cd singularity
-          ./mconfig --without-suid -p /usr/local/
-          make -C ./builddir
-          sudo make -C ./builddir install
-          cd ..
-      - name: Echo singularity version
-        run: |
-          echo ${{ github.ref }}
-          singularity --version
       - name: Fetch repository
         uses: actions/checkout@v4
       - name: Fetch tags
@@ -99,6 +69,8 @@ jobs:
         run: pip install .[test,psij,dask]
       - name: Print version
         run: python -c "import pydra.engine; print(pydra.engine.__version__)"
+      - name: Disable etelemetry
+        run:  echo "NO_ET=TRUE" >> $GITHUB_ENV
       - name: Pytest
         run: |
           pytest -vs -n auto pydra --doctest-modules --with-psij --cov pydra --cov-config .coveragerc --cov-report xml:cov.xml
@@ -133,6 +105,63 @@ jobs:
       - name: Upload to codecov
         run: codecov -f cov.xml -F unittests -e GITHUB_WORKFLOW
 
+  test-singularity:
+    needs: ['build']
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        python-version: ['3.11', '3.12', '3.13']
+      fail-fast: False
+    steps:
+      - name: Set env
+        run: |
+          echo "RELEASE_VERSION=v3.7.1" >> $GITHUB_ENV
+          echo "NO_ET=TRUE" >> $GITHUB_ENV
+      - name: Setup Singularity
+        uses: actions/checkout@v4
+        with:
+          repository: hpcng/singularity
+          ref: 'v3.7.1'
+          path: 'singularity'
+      - name: Setup GO
+        uses: actions/setup-go@v5
+        with:
+          go-version: '^1.13'
+      - name: Install OS deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install flawfinder squashfs-tools uuid-dev libuuid1 libffi-dev libssl-dev libssl1.1 \
+          libarchive-dev libgpgme11-dev libseccomp-dev wget gcc make pkg-config -y
+      - name: Build
+        run: |
+          cd singularity
+          ./mconfig --without-suid -p /usr/local/
+          make -C ./builddir
+          sudo make -C ./builddir install
+          cd ..
+      - name: Echo singularity version
+        run: |
+          echo ${{ github.ref }}
+          singularity --version
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Update build tools
+        run: python -m pip install --upgrade pip
+      - name: Checkout Pydra repo
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository }}
+      - name: Fetch tags
+        run: git fetch --prune --unshallow
+      - name: Install pydra (test)
+        run: pip install -e ".[test]"
+      - name: Pytest
+        run: pytest -vs --cov pydra --cov-config .coveragerc --cov-report xml:cov.xml pydra/engine/tests/test_singularity.py pydra/engine/tests/test_environments.py
+      - name: Upload to codecov
+        run: codecov -f cov.xml -F unittests -e GITHUB_WORKFLOW
+
   test-slurm:
     needs: ['build']
     strategy: