Merge branch 'fullexample' of github.com:spdx/spdx-spec into fullexample

Author: goneall

.github/workflows/validate_examples.yml

@@ -21,7 +21,7 @@ jobs:
           cache: "pip"
       - name: Install Python dependencies
         run: |
-          python3 -m pip install check-jsonschema==0.31.0 pyshacl==0.30.0 spdx3-validate==0.0.5
+          python3 -m pip install check-jsonschema==0.34.1 spdx3-validate==0.0.5
       - name: Install dependencies
         run: |
           sudo apt install -y gawk

bin/check-examples.sh

@@ -29,7 +29,6 @@ echo "RDF resolved     : $(curl -I "$RDF_URL" 2>/dev/null | grep -i "location:"
 echo "Context          : $CONTEXT_URL"
 echo "Context resolved : $(curl -I "$CONTEXT_URL" 2>/dev/null | grep -i "location:" | awk '{print $2}')"
 echo "$(check-jsonschema --version)"
-echo -n "$(pyshacl --version)"
 echo "spdx3-validate version: $(spdx3-validate --version)"
 echo ""
 
@@ -41,14 +40,6 @@ check_schema() {
         "$1"
 }
 
-check_model() {
-    echo "Checking model (pyschacl): $1"
-    pyshacl \
-        --shacl $RDF_URL \
-        --ont-graph $RDF_URL \
-        "$1"
-}
-
 check_spdx() {
     echo "SPDX 3 Validating (spdx3-validate): $1"
     spdx3-validate --json $1
@@ -59,8 +50,6 @@ if [ "$(ls $THIS_DIR/../$JSON_DIR/*.json 2>/dev/null)" ]; then
     for f in $THIS_DIR/../$JSON_DIR/*.json; do
         check_schema $f
         echo ""
-        check_model $f
-        echo ""
         check_spdx $f
         echo ""
     done
@@ -117,9 +106,6 @@ HEREDOC
     done
 
     echo "{}]" >> $COMBINED_JSON
-
-    check_model $COMBINED_JSON
-    echo ""
     check_spdx $COMBINED_JSON
     echo ""
 done