Merge branch 'main' into enhancement/cwl-inputs-schema-gen

.github/workflows/ci-tests.yml

@@ -65,7 +65,7 @@ jobs:
 
       - name: Upload coverage to Codecov
         if: ${{ matrix.step == 'unit' }}
-        uses: codecov/codecov-action@v4.2.0
+        uses: codecov/codecov-action@v4.3.1
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
@@ -121,12 +121,12 @@ jobs:
 
       - name: pull some containers
         run: |
-          export CWL_SINGULARITY_CACHE=$(echo $GITHUB_WORKSPACE)/singularity_cache
-          mkdir -p ${CWL_SINGULARITY_CACHE}
-          singularity pull --name ${CWL_SINGULARITY_CACHE}/node_alpine.sif docker://docker.io/node:alpine
-          ls -lh ${CWL_SINGULARITY_CACHE}
-          echo ${CWL_SINGULARITY_CACHE}
-          echo "CWL_SINGULARITY_CACHE=${CWL_SINGULARITY_CACHE}" >> $GITHUB_ENV
+          export CWL_SINGULARITY_CACHE=$GITHUB_WORKSPACE/singularity_cache
+          mkdir -p "${CWL_SINGULARITY_CACHE}"
+          singularity pull --name "${CWL_SINGULARITY_CACHE}/node_alpine.sif" docker://docker.io/node:alpine
+          ls -lh "${CWL_SINGULARITY_CACHE}"
+          echo "${CWL_SINGULARITY_CACHE}"
+          echo "CWL_SINGULARITY_CACHE=${CWL_SINGULARITY_CACHE}" >> "$GITHUB_ENV"
 
       - name: Set up Python
         uses: actions/setup-python@v5

Makefile

@@ -210,7 +210,7 @@ cwl_utils/parser/cwl_v1_1.py: FORCE
 cwl_utils/parser/cwl_v1_2.py: FORCE
 	schema-salad-tool --codegen python \
 		--codegen-parser-info "org.w3id.cwl.v1_2" \
-		https://github.com/common-workflow-language/cwl-v1.2/raw/1.2.1_proposed/CommonWorkflowLanguage.yml \
+		https://github.com/common-workflow-language/cwl-v1.2/raw/codegen/CommonWorkflowLanguage.yml \
 		> $@
 
 regen_parsers: cwl_utils/parser/cwl_v1_*.py

cwl_utils/__meta__.py

@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0
 """Global version number for the cwl_utils package."""
-__version__ = "0.32"
+__version__ = "0.33"