Skip to content

Commit

Permalink
Added noLinkCheck to format field
Browse files Browse the repository at this point in the history
CWL parsers should not follow `format` links.
  • Loading branch information
GlassOfWhiskey committed Nov 16, 2023
1 parent d8c0e08 commit 82b2347
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 47 deletions.
1 change: 1 addition & 0 deletions Base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ $graph:
_id: cwl:format
_type: "@id"
identity: true
noLinkCheck: true
doc: |
The format of the file: this must be an IRI of a concept node that
represents the file format, preferably defined within an ontology.
Expand Down
2 changes: 2 additions & 0 deletions Process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ $graph:
_id: cwl:format
_type: "@id"
identity: true
noLinkCheck: true
doc: |
Only valid when `type: File` or is an array of `items: File`.
Expand All @@ -221,6 +222,7 @@ $graph:
_id: cwl:format
_type: "@id"
identity: true
noLinkCheck: true
doc: |
Only valid when `type: File` or is an array of `items: File`.
Expand Down
2 changes: 1 addition & 1 deletion concepts.md
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ prefix listed in the `$namespaces` section of the document as described in the
[Schema Salad specification](SchemaSalad.html#Explicit_context).

It is recommended that concepts from schema.org are used whenever possible.
For the `$schemas` field we recommend their RDF encoding: http://schema.org/version/latest/schema.rdf
For the `$schemas` field we recommend their RDF encoding: https://schema.org/version/latest/schemaorg-current-https.rdf

Implementation extensions which modify execution semantics must be [listed in
the `requirements` field](#Requirements_and_hints).
Expand Down
6 changes: 3 additions & 3 deletions render.bash
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env bash
if [[ -z "$WORKSPACE" ]] ; then
WORKSPACE=$PWD
WORKSPACE=$PWD/temp/
fi
mkdir -p $WORKSPACE
repo=https://github.com/common-workflow-language/cwl-website \
bn=$(basename $repo)
bn=$WORKSPACE/$(basename $repo)
if [[ -d $bn ]] ; then
(cd $bn && git fetch origin && git reset --hard origin/main)
else
git clone $repo && pushd $bn; git checkout main ; git show --no-patch ; popd
git clone $repo $bn && pushd $bn; git checkout main ; git show --no-patch ; popd
fi
echo "- basename: Base.yml" >> $WORKSPACE/cwl-website/site/v1.2-deps.yaml
echo " class: File" >> $WORKSPACE/cwl-website/site/v1.2-deps.yaml
Expand Down
4 changes: 1 addition & 3 deletions salad/schema_salad/metaschema/metaschema_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ $graph:
typeDSL: true
refScope: 2
doc: |
The field type. If it is an array, it indicates
that the field type is a union type of its elements.
Its elements may be duplicated.
The field type
- name: RecordSchema
Expand Down
2 changes: 1 addition & 1 deletion salad/schema_salad/metaschema/salad.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ enable or disable the behavior described.
## Data concepts

An **object** is a data structure equivalent to the "object" type in JSON,
consisting of an unordered set of name/value pairs (referred to here as
consisting of a unordered set of name/value pairs (referred to here as
**fields**) and where the name is a string and the value is a string, number,
boolean, array, or object.

Expand Down
19 changes: 0 additions & 19 deletions tests/cat3-tool-docker.cwl

This file was deleted.

20 changes: 0 additions & 20 deletions tests/wc-tool-shortcut.cwl

This file was deleted.

0 comments on commit 82b2347

Please sign in to comment.