Improve --parallel --singularity

.github/workflows/ci-tests.yml

@@ -28,7 +28,7 @@ jobs:
 
   tox:
     name: Tox
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         py-ver-major: [3]
@@ -47,8 +47,8 @@ jobs:
       - name: Set up Singularity and environment-modules
         if: ${{ matrix.step == 'unit' || matrix.step == 'mypy' }}
         run: |
-          wget --no-verbose https://github.com/sylabs/singularity/releases/download/v4.2.1/singularity-ce_4.2.1-focal_amd64.deb
-          sudo apt-get install -y ./singularity-ce_4.2.1-focal_amd64.deb environment-modules
+          wget --no-verbose https://github.com/sylabs/singularity/releases/download/v4.3.5/singularity-ce_4.3.5-noble_amd64.deb
+          sudo apt-get install -y ./singularity-ce_4.3.5-noble_amd64.deb environment-modules
 
       - name: Give the test runner user a name to make provenance happy.
         if: ${{ matrix.step == 'unit' || matrix.step == 'mypy' }}
@@ -70,7 +70,7 @@ jobs:
       - name: Upgrade setuptools and install tox
         run: |
           pip install -U pip setuptools wheel
-          pip install "tox<4" "tox-gh-actions<3"
+          pip install tox tox-gh-actions
 
       - name: MyPy cache
         if: ${{ matrix.step == 'mypy' }}
@@ -116,7 +116,7 @@ jobs:
       - name: Upgrade setuptools and install tox
         run: |
           pip install -U pip setuptools wheel
-          pip install "tox<4" "tox-gh-actions<3"
+          pip install tox tox-gh-actions
 
       - if: ${{ matrix.step == 'pydocstyle' && github.event_name == 'pull_request'}}
         name: Create local branch for diff-quality for PRs
@@ -127,7 +127,7 @@ jobs:
 
   clean_working_dir:
     name: No leftovers
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       py-semver: "3.13"
     steps:
@@ -137,8 +137,8 @@ jobs:
 
       - name: Set up Singularity and environment-modules
         run: |
-          wget --no-verbose https://github.com/sylabs/singularity/releases/download/v4.2.1/singularity-ce_4.2.1-focal_amd64.deb
-          sudo apt-get install -y ./singularity-ce_4.2.1-focal_amd64.deb environment-modules
+          wget --no-verbose https://github.com/sylabs/singularity/releases/download/v4.3.5/singularity-ce_4.3.5-noble_amd64.deb
+          sudo apt-get install -y ./singularity-ce_4.3.5-noble_amd64.deb environment-modules
 
       - name: Give the test runner user a name to make provenance happy.
         run: sudo usermod -c 'CI Runner' "$(whoami)"
@@ -165,7 +165,7 @@ jobs:
 
   conformance_tests:
     name: CWL conformance
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
@@ -186,8 +186,8 @@ jobs:
       - name: Set up Singularity and environment-modules
         if: ${{ matrix.container == 'singularity' }}
         run: |
-          wget --no-verbose https://github.com/sylabs/singularity/releases/download/v4.2.1/singularity-ce_4.2.1-focal_amd64.deb
-          sudo apt-get install -y ./singularity-ce_4.2.1-focal_amd64.deb environment-modules
+          wget --no-verbose https://github.com/sylabs/singularity/releases/download/v4.3.5/singularity-ce_4.3.5-noble_amd64.deb
+          sudo apt-get install -y ./singularity-ce_4.3.5-noble_amd64.deb environment-modules
 
       - name: Singularity cache
         if: ${{ matrix.container == 'singularity' }}
@@ -227,15 +227,15 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   release_test:
     name: cwltool release test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v6
 
       - name: Set up Singularity and environment-modules
         run: |
-          wget --no-verbose https://github.com/sylabs/singularity/releases/download/v4.2.1/singularity-ce_4.2.1-focal_amd64.deb
-          sudo apt-get install -y ./singularity-ce_4.2.1-focal_amd64.deb environment-modules
+          wget --no-verbose https://github.com/sylabs/singularity/releases/download/v4.3.5/singularity-ce_4.3.5-noble_amd64.deb
+          sudo apt-get install -y ./singularity-ce_4.3.5-noble_amd64.deb environment-modules
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -290,7 +290,7 @@ jobs:
       - name: Upgrade setuptools and install tox
         run: |
           pip install -U pip setuptools wheel
-          pip install "tox<4" "tox-gh-actions<3"
+          pip install tox tox-gh-actions
       # # docker for mac install is not currently stable
       # - name: 'SETUP MacOS: load Homebrew cache'
       #   uses: actions/cache@v4

README.rst

@@ -732,14 +732,14 @@ To run the basic tests after installing `cwltool` execute the following:
 To run various tests in all supported Python environments, we use `tox <https://github.com/common-workflow-language/cwltool/tree/main/tox.ini>`_. To run the test suite in all supported Python environments
 first clone the complete code repository (see the ``git clone`` instructions above) and then run
 the following in the terminal:
-``pip install "tox<4"; tox -p``
+``pip install tox; tox -p``
 
 List of all environment can be seen using:
 ``tox --listenvs``
 and running a specific test env using:
-``tox -e <env name>``
+``tox run -e <env name>``
 and additionally run a specific test using this format:
-``tox -e py310-unit -- -v tests/test_examples.py::test_scandeps``
+``tox run -e py310-unit -- -v tests/test_examples.py::test_scandeps``
 
 -  Running the entire suite of CWL conformance tests: