Skip to content

[WIP] Draft 4.dev3 to v1.0.dev4 #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 250 commits into from
Jul 6, 2016
Merged

[WIP] Draft 4.dev3 to v1.0.dev4 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
250 commits
Select commit Hold shift + click to select a range
9c8c36f
tolerate git not being installed
mr-c Mar 18, 2016
10c23e9
add citation information
mr-c Mar 18, 2016
0f438d7
make this obvious
mr-c Mar 18, 2016
953d8b6
Add "Creating files at runtime" to UserGuide
Mar 31, 2016
0f6ddf2
Add missing files / links. Another section WIP.
Apr 1, 2016
a549f35
Add Javascript expression section to UserGuide. Add conformance test…
Apr 5, 2016
d6e55cc
Remove non-participating organization
mr-c Apr 5, 2016
4daac6d
Update userguide inputs file.
Apr 8, 2016
d361b6c
Bump version #
Apr 13, 2016
8008eb7
Talk about Javascript. Fix CWLType.
Apr 13, 2016
f4daf16
Remove redundant example- from examples.
Apr 13, 2016
c6146a0
Merge pull request #192 from mr-c/citation
mr-c Apr 14, 2016
516793f
Switch inputs to use yaml instead of json.
Apr 15, 2016
d34d2ac
Merge branch 'master' of github.com:common-workflow-language/common-w…
Apr 15, 2016
82a09b7
enable coverage testing
mr-c Apr 17, 2016
7b06209
Update docker.cwl
Apr 18, 2016
8596238
Merge pull request #199 from neevor/patch-1
mr-c Apr 19, 2016
e4938b6
Branched draft-4 spec.
Mar 29, 2016
1473e34
document adding a new draft
mr-c Apr 21, 2016
ba8b894
Add 'draft-4/salad/' from commit '9c8c36f4defedbd55af1956a915dbf5373e…
mr-c Apr 21, 2016
0b09a19
Makedoc detects any ``` for toggling looking for # for section headings.
Apr 21, 2016
37c129d
Merge branch 'master' of github.com:common-workflow-language/schema_s…
Apr 21, 2016
6cf9db8
Add workflow example to user guide. Add missing files.
Apr 21, 2016
be35388
Merge branch 'master' of github.com:common-workflow-language/common-w…
Apr 21, 2016
262d057
Merge commit '37c129d361c788c044d171a9e95a407599d50b43' into draft-4
Apr 21, 2016
f34a2a6
Markup fields to take advantage of draft-4 syntax improvements
Apr 21, 2016
2514a23
switch to ruamel.yaml, use C loader if available, only load safely (#20)
mr-c Apr 28, 2016
0c5dba5
measure code coverage (#12)
mr-c Apr 28, 2016
ff192e8
turn off py3 support for now (#19)
mr-c Apr 28, 2016
9041ba8
Added Directory type; added InitialWorkingDirectory to specify setup …
psaffrey-illumina Apr 28, 2016
951a703
Merge remote-tracking branch 'origin/draft-4' into draft-4
psaffrey-illumina Apr 28, 2016
4b85432
sync draft-4 with draft-3 tests
mr-c Apr 21, 2016
bb112fe
updates
mr-c May 3, 2016
ee1cf15
add missing hashmarks
mr-c May 3, 2016
d13091a
Comment out 'size' on Directory for now.
May 4, 2016
4e24484
Fix "out" to be valid Avro schema.
May 4, 2016
c51c723
enable rdfa schema format (#22)
mr-c May 5, 2016
fd2fcb3
more type checking (#21)
mr-c May 5, 2016
bef607e
Fix draft-3 conformance tests missing 'cwlVersion'. The 'cwlVersion'…
May 5, 2016
d674994
Merge branch 'master' into draft-4
May 5, 2016
d4fd68c
cwlVersion is @vocab
May 5, 2016
15dae9f
enhance CI
mr-c May 5, 2016
e381f64
Return metaschema loader from load_schema. Don't crash expanding ide…
May 5, 2016
aeab7c3
Merge branch 'master' of github.com:common-workflow-language/schema_s…
May 5, 2016
2d0398e
Bump version.
May 5, 2016
f43fa45
Fix tests
May 5, 2016
0efa6f5
Put prefix back on "cwlVersion: draft-3"
May 5, 2016
1adbb18
Put prefix back on "cwlVersion: draft-3"
May 5, 2016
f725282
Fix draft-3 version symbols in schema.
May 5, 2016
d798a7e
split out mypy
mr-c May 5, 2016
a2a9330
Merge branch 'master' into draft-4
May 5, 2016
ab086ad
Fix version symbols in draft-4
May 5, 2016
5b969ca
fix diff-cover
mr-c May 5, 2016
6c2a2bd
Ported draft-2 schema to schema salad proper for validation by curren…
May 5, 2016
c344fa4
Merge branch 'master' into draft-4
May 5, 2016
19ca76c
Add documentRoot
May 5, 2016
fd37b4b
Add cwlVersion to draft-2 spec.
May 5, 2016
d5c4ef4
Add CWLVersions to draft-2, and change cwlVersion field to ref CWLVer…
May 5, 2016
b31130f
Fixes to pass conformance tests.
May 5, 2016
e8a458b
Fix hints
May 5, 2016
6346fdf
SchemaDef extends InputSchema
May 5, 2016
712bf65
Fix specialize
May 5, 2016
9b737de
Changed name for initial working directory
psaffrey-illumina May 6, 2016
ca31436
Specialize Binding to CommandLineBinding for SchemaDef.
May 6, 2016
c4cfafb
Make draft-2 SchemaDef name optional.
May 6, 2016
e562b21
Merge branch 'draft-4' of github.com:common-workflow-language/common-…
May 6, 2016
2c14f2f
Update conformance tests with draft-4 version number.
May 6, 2016
899d135
Update conformance tests to use draft-4 syntax improvements.
May 6, 2016
f027dbb
Permit idmaps for hints, envDef
May 6, 2016
8c5bda0
Fix mapSubject fields when $import or $include is provided.
May 6, 2016
089fbd7
start documenting the draft-4 changes
mr-c May 8, 2016
53b2ad7
Merge pull request #200 from common-workflow-language/draft-4
mr-c May 10, 2016
cff09a0
Add link to latest User Guide on front page
mr-c May 10, 2016
31fbb76
Fix site generation workflows to specify draft-3
May 10, 2016
5316da0
Add missing files for site generation.
May 11, 2016
979453a
initial description of cwl-runner interface
mr-c May 18, 2016
c7a2bf1
move to a better location
mr-c May 18, 2016
81bd8de
description
mr-c May 18, 2016
b1e740e
bind and order the tool and jobfiles
mr-c May 18, 2016
04dfbf0
toolfile is optional
mr-c May 18, 2016
ee0bea3
add descriptions
mr-c May 18, 2016
d791500
add output stanza, fix syntax
mr-c May 23, 2016
28f64f0
clarify description
mr-c May 23, 2016
3b8dc09
mypy 0.4 is out (#25)
mr-c May 24, 2016
84738f1
better RDF schema error handling (#26)
mr-c May 24, 2016
f0ac285
Merge branch 'master' of github.com:common-workflow-language/schema_s…
May 24, 2016
180a21e
Corrections and test data
denis-yuen May 24, 2016
1ea9a5c
add jenkins link
mr-c May 30, 2016
b4d790d
Backport fixes to draft-3
denis-yuen May 30, 2016
11b45b5
Merge pull request #224 from common-workflow-language/jenkins-link
mr-c May 31, 2016
563e5ef
fix jenkins build
mr-c May 31, 2016
e1e17ea
upgrade Jenkins setuptools
mr-c May 31, 2016
da10eec
always be updating (mypy-lang)
mr-c May 31, 2016
f36f52f
Merge pull request #219 from denis-yuen/patch-1
mr-c May 31, 2016
9fcd67d
Fold link validation into resolve_all() and resolve scoped identifiers.
May 31, 2016
efbc9c4
Add scopedRef to metaschema. Tweak test.
Jun 1, 2016
e5d4730
New test for scoped ref that better reflects actual desired behavior.
Jun 1, 2016
2fa6bfb
update types
mr-c Jun 1, 2016
ae0ef4e
Remove explicit calls to validate_links since it is folded into resol…
Jun 2, 2016
c6d4a7b
Reworking refScope to be fixed instead of search based.
Jun 2, 2016
4ef52be
Improve documentation. Add feature of skipping some inner scopes.
Jun 2, 2016
5aadf27
fix types
mr-c Jun 2, 2016
ad8a111
Merge pull request #28 from common-workflow-language/scoped_ref
mr-c Jun 3, 2016
33ef215
Refactor resolve_all into smaller methods.
Jun 3, 2016
8072bf5
"type" DSL wip
Jun 3, 2016
116d9e4
Merge branch 'resolve_all_refactor'
Jun 3, 2016
31db28e
Merge branch 'master' into type_dsl. Add test for typeDSL.
Jun 3, 2016
3055f70
Update bootstrap context.
Jun 3, 2016
1e6dab6
Using typeDSL in metaschema.
Jun 3, 2016
347c28e
Merge pull request #212 from common-workflow-language/cwl-runner-inte…
mr-c Jun 6, 2016
71e9b3d
add stderr object
mr-c Jun 6, 2016
3431e18
Use scopedRef and typeDSL in metaschema
Jun 6, 2016
8823aaa
Adjust ref scopes
Jun 7, 2016
510a01f
Merge commit '8823aaa11432aa042b3e307891e71ee13e11bfd7' into scoped-r…
Jun 7, 2016
851b3c1
Split minimal base types used in CWL into metaschema_base.yml
Jun 7, 2016
5e1e438
Merge commit '851b3c1302aa5b5d8a80f74c5732a617f62acefe' into scoped-r…
Jun 7, 2016
e298bdc
Detect when an abstract class is used but doesn't have a concrete sub…
Jun 7, 2016
d03b190
Introducing refScope and typeDSL into CWL schema
Jun 7, 2016
5393edc
fixes types, removes a few more Anys
mr-c Jun 8, 2016
ad34521
fix bug introduced by refactor
mr-c Jun 8, 2016
e554b2b
Merge pull request #33 from common-workflow-language/fix-resolve_all_…
mr-c Jun 8, 2016
50bd76a
Updating to draft-4.dev2
Jun 8, 2016
0b987d3
add test
mr-c Jun 8, 2016
d1d53b3
Merge pull request #227 from common-workflow-language/stderr
mr-c Jun 8, 2016
97e8f75
More updating to draft-4.dev2
Jun 8, 2016
68a5c6c
More updating to draft-4.dev2
Jun 8, 2016
6e71f35
Merge remote-tracking branch 'origin/master' into type_dsl
mr-c Jun 9, 2016
c03eb1e
type fixes
mr-c Jun 9, 2016
57f7e83
borrow the updated re.pyi from typeshed
mr-c Jun 9, 2016
96f08e8
Merge remote-tracking branch 'origin/master' into type_dsl
mr-c Jun 9, 2016
4350b30
type clarification
mr-c Jun 9, 2016
d65fb83
more unicode
mr-c Jun 9, 2016
9ca6cc9
remove more str types, possible fix for edam failed test
mr-c Jun 9, 2016
e93b038
Add missing file
Jun 9, 2016
bedb736
Merge branch 'type_dsl' of github.com:common-workflow-language/schema…
Jun 9, 2016
b8edddc
re-enable test_avro_regression
mr-c Jun 9, 2016
2cfde6b
Merge pull request #32 from common-workflow-language/type_dsl
mr-c Jun 10, 2016
6ac559e
version bump
mr-c Jun 10, 2016
3e1b02c
Merge commit '6ac559ed62780091eb0cfff914018ed101ef46ef' into scoped-r…
mr-c Jun 10, 2016
c4cecad
Merge pull request #228 from common-workflow-language/scoped-ref-and-…
mr-c Jun 10, 2016
ddf417b
Command line generation tests now work by executing a small script th…
Jun 10, 2016
ac17f5d
Port draft-2 changes to command line generation tests to draft-3.
Jun 10, 2016
f2a18c3
Add missing args.py used by draft-3 tests.
Jun 10, 2016
3cc79d2
Port draft-3 changes to command line generation tests to draft-4.
Jun 10, 2016
57a5bc8
Fix last test using "args"
Jun 10, 2016
de7cb76
Add listing to directory type
Jun 10, 2016
a2263a9
Make path/listing optional (sort of).
Jun 10, 2016
392be2f
fixing site build?
mr-c Jun 13, 2016
9d0fbe0
initial stdout & stderr shortcut support
mr-c Jun 13, 2016
52f6411
extend doc to stderr psuedotype
mr-c Jun 14, 2016
5ad6a16
Allow expressions in `arguments`
Jun 14, 2016
24a611d
use long ids?
mr-c Jun 14, 2016
a5a7516
nope, use an enum instead
mr-c Jun 14, 2016
0ba703d
jsonldPredicate did it!
mr-c Jun 14, 2016
cbd7bc2
only allow use of stderr/stdout shortcuts as types for the Outputs. B…
mr-c Jun 14, 2016
06c9ba7
Merge pull request #230 from common-workflow-language/stderr-out-types
mr-c Jun 14, 2016
c30b79f
finish restoring allowable types for parameters
mr-c Jun 15, 2016
0c275b4
clarify that outputBinding must not be set
mr-c Jun 15, 2016
3940210
re-add types to ExpressionTool, InputParameter
mr-c Jun 15, 2016
272aefa
Merge pull request #231 from common-workflow-language/restore-workflo…
mr-c Jun 16, 2016
7eeb70a
reparent file specific fields from SchemaBase to Parameter
mr-c Jun 17, 2016
45f542a
use CWLType more often
mr-c Jun 17, 2016
832b52b
Add initial conformance tests for input and output of directory objects.
Jun 20, 2016
227a981
Add basename, nameroot, nameext to conformance tests.
Jun 21, 2016
45af7a3
Add location, update text for dirname, basename, nameroot, nameext.
Jun 23, 2016
2d7ca73
Adjust Directory to also use a `location` field to identify it.
Jun 23, 2016
8798dc8
Merge branch 'master' into directory
Jun 23, 2016
b449b3d
location field is required on File and Directory. Rename conflicting…
Jun 23, 2016
c55f733
Add draft-4.dev3
Jun 23, 2016
32c4a37
Updating conformance tests to draft-4.dev3, path -> location
Jun 24, 2016
ff5ddf3
Bring up to date with draft-4 changes.
Jun 24, 2016
41c119b
Merge pull request #233 from common-workflow-language/cwltype-v-primi…
mr-c Jun 26, 2016
43b5fb9
Describe LooseDependencyHints.
jmchilton Jun 17, 2016
0b12a24
soften description, allow for list of specs, add identifier
mr-c Jun 27, 2016
6c6ab97
fix failing tests
mr-c Jun 27, 2016
972e3b7
Merge pull request #232 from common-workflow-language/move-file-relat…
mr-c Jun 27, 2016
524d2c0
Merge branch 'master' into directory
Jun 27, 2016
4efa80b
Allow "Directory" in secondaryFiles to describe structured dependencies.
Jun 27, 2016
5dba12b
Add InitialWorkDirRequirement, supercedes CreateFileRequirement.
Jun 28, 2016
107d005
Allow expression to provide full listing for InitialWorkDirRequirement
Jun 28, 2016
56ef87a
secondaryFiles has Dirent, not Directory.
Jun 28, 2016
5239b16
Fix syntax error. Update tests to use InitialWorkDirRequirement
Jun 28, 2016
9dfbb8e
Update tests to use InitialWorkDirRequirement
Jun 29, 2016
eb9449f
Adding directory feature tests.
Jun 29, 2016
a5976f3
Unify Directory listing, InitialWorkDir and secondaryFiles to accept …
Jun 29, 2016
5b56226
Update test
Jun 29, 2016
8b48da6
Update stderr-shortcut tests.
Jun 29, 2016
c6538ab
Remove CreateFileRequirement. Add documentation to InitialWorkDirReq…
Jun 29, 2016
afe31c1
Delete obsolote initialWorkDir record from previous work on Directory
Jun 29, 2016
cae0407
Add test staging files into output directory for update.
Jun 29, 2016
9ba0d38
Add test using value of inputs post-scatter.
Jun 30, 2016
db4113b
Update text to say that 'inputs' on scatter is the post-scatter input…
Jun 30, 2016
9caa2cf
Merge pull request #240 from common-workflow-language/dependency_hint
mr-c Jun 30, 2016
93b60d9
Merge remote-tracking branch 'origin/master' into scatter-inputs
mr-c Jun 30, 2016
11b96f1
Merge pull request #242 from common-workflow-language/scatter-inputs
mr-c Jun 30, 2016
a90b71f
replace errant draft-4.dev3 with dev2
mr-c Jun 30, 2016
fcc5374
Merge remote-tracking branch 'origin/master' into directory
mr-c Jun 30, 2016
cb78824
Merge pull request #236 from common-workflow-language/directory
mr-c Jun 30, 2016
6f9cb1c
fix the draft-4 tests
mr-c Jul 1, 2016
6266928
Squashed 'draft-4/salad/' changes from 9c8c36f..c509a07
Jul 1, 2016
def6e52
Merge commit '6266928eac323672c0c44d16dca91d808fbc5e68'
Jun 24, 2016
09bd8ef
Updating site generation for draft-4.
Jul 2, 2016
63dcbdc
Merge branch 'master' of github.com:common-workflow-language/common-w…
Jul 2, 2016
7302ecc
Make "location" field optional when "listing" is provided.
Jul 2, 2016
01cf6db
Site generation works again
Jul 3, 2016
d5b2627
Fix ttl and context generation
Jul 3, 2016
3fb9340
Get rid of Dirent. Update spec for basename. Add contents field to …
Jul 4, 2016
d873510
Use file content literals for InitialWorkDir.
Jul 4, 2016
7d002ad
Fix field name conflict.
Jul 4, 2016
f69576a
Remove mapSubject entryname.
Jul 4, 2016
34d946e
Make location optional to support File contents literals.
Jul 4, 2016
b40896c
Fix basename.
Jul 4, 2016
d5f2322
Restore Dirent for InitialWorkDir only.
Jul 4, 2016
95b7454
Using Dirent.
Jul 4, 2016
c1cd55f
Remove conflicting mapSubject/mapPredicate
Jul 4, 2016
5b66f2b
Add test of file literals.
Jul 4, 2016
b7a6cb6
Update site generation after removing Dirent from Directory type.
Jul 4, 2016
5bada39
make basename field optional, matching the prose
mr-c Jul 5, 2016
02022b7
explain what was meant by "Binding"
mr-c Jul 5, 2016
f773701
correct new file literal test
mr-c Jul 5, 2016
b16ae29
Merge pull request #244 from common-workflow-language/eliminate-dirent
mr-c Jul 5, 2016
48b6ac1
add instructions for discovering CWL documents on the local FS
mr-c Jul 6, 2016
4ae00d5
Merge pull request #246 from common-workflow-language/cwl-discovery
mr-c Jul 6, 2016
b8bf21b
edits
mr-c Jun 27, 2016
abac35b
change all mentions of URIs to IRIs
mr-c Jul 1, 2016
6927b87
clarify stdout & stderr when no filename is specified
mr-c Jul 1, 2016
b74ff17
document changes in draft-4 for CLTs
mr-c Jul 1, 2016
918e72e
map draft-4 javascript exceptions to CWL permanentFailures
mr-c Jul 1, 2016
af62ad8
list disallowed characters in file paths or locations for draft-4
mr-c Jul 2, 2016
80e0465
clarify that one should not capture stderr destined for process output
mr-c Jul 2, 2016
cc537b8
set cwlVersion as mandatory for draft-4
mr-c Jul 2, 2016
e5e21ea
drop restrictions from location field
mr-c Jul 6, 2016
56d7f7b
disable draft-4 userguide for now
mr-c Jul 6, 2016
2a35392
Merge pull request #243 from common-workflow-language/mrc-edits
mr-c Jul 6, 2016
c7e257f
No class field in ProcessRequirement, added class field to all requir…
Jul 6, 2016
f17fed0
Merge branch 'master' into fix/requirement_class
Jul 6, 2016
d01e12e
Merge pull request #248 from common-workflow-language/fix/requirement…
mr-c Jul 6, 2016
fc18176
refine formatting of CWL discovery locations
mr-c Jul 6, 2016
9173ed7
change draft-4.dev3 to v1.0.dev4
mr-c Jul 6, 2016
b29edd8
change cwl:v1.0.dev4 to v1.0.dev4 (no prefix)
mr-c Jul 6, 2016
2acecf5
move draft-4 to v1.0 directory
mr-c Jul 6, 2016
54d40a1
update schema salad version
mr-c Jul 6, 2016
26d974e
drop cwltool/schemas
mr-c Jul 6, 2016
1c57b22
Add 'cwltool/schemas/' from commit '2acecf508214afebaab31350a80479ac4…
mr-c Jul 6, 2016
12f7489
fix remaining references to draft-4
mr-c Jul 6, 2016
2138456
fix version splitting
mr-c Jul 6, 2016
eff0eb1
Squashed 'cwltool/schemas/' changes from 2acecf5..0fbe804
mr-c Jul 6, 2016
9c885bb
Merge commit 'eff0eb137db3a737b36bdeab82b5d462d5eff4c2' into draft-4.…
mr-c Jul 6, 2016
8595405
Squashed 'cwltool/schemas/' changes from 0fbe804..3c40bd3
mr-c Jul 6, 2016
76ba33c
Merge commit '8595405d8ce78fd288a2cd24e334818c83149886' into draft-4.…
mr-c Jul 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions cwltool/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ def get_schema(version):
return SCHEMA_CACHE[version]

cache = {}
version = version.split("#")[-1].split(".")[0]
version = version.split("#")[-1]
if 'dev' in version:
version = ".".join(version.split(".")[:-1])
for f in cwl_files:
try:
res = resource_stream(__name__, 'schemas/%s/%s' % (version, f))
Expand Down Expand Up @@ -314,13 +316,13 @@ def __init__(self, toolpath_object, **kwargs):

global SCHEMA_FILE, SCHEMA_DIR, SCHEMA_ANY # pylint: disable=global-statement
if SCHEMA_FILE is None:
get_schema("draft-4")
get_schema("v1.0")
SCHEMA_ANY = cast(Dict[unicode, Any],
SCHEMA_CACHE["draft-4"][3].idx["https://w3id.org/cwl/salad#Any"])
SCHEMA_CACHE["v1.0"][3].idx["https://w3id.org/cwl/salad#Any"])
SCHEMA_FILE = cast(Dict[unicode, Any],
SCHEMA_CACHE["draft-4"][3].idx["https://w3id.org/cwl/cwl#File"])
SCHEMA_CACHE["v1.0"][3].idx["https://w3id.org/cwl/cwl#File"])
SCHEMA_DIR = cast(Dict[unicode, Any],
SCHEMA_CACHE["draft-4"][3].idx["https://w3id.org/cwl/cwl#Directory"])
SCHEMA_CACHE["v1.0"][3].idx["https://w3id.org/cwl/cwl#Directory"])

names = schema_salad.schema.make_avro_schema([SCHEMA_FILE, SCHEMA_DIR, SCHEMA_ANY],
schema_salad.ref_resolver.Loader({}))[0]
Expand Down
14 changes: 12 additions & 2 deletions cwltool/schemas/site/cwlsite-draft4-job.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"https://w3id.org/cwl/cwl#CreateFileRequirement=CommandLineTool.html#CreateFileRequirement",
"https://w3id.org/cwl/cwl#EnvVarRequirement=CommandLineTool.html#EnvVarRequirement",
"https://w3id.org/cwl/cwl#ShellCommandRequirement=CommandLineTool.html#ShellCommandRequirement",
"https://w3id.org/cwl/cwl#ResourceRequirement=CommandLineTool.html#ResourceRequirement",
"https://w3id.org/cwl/cwl#ResourceRequirement=CommandLineTool.html#ResourceRequirement"
],
"brandlink": "index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
Expand All @@ -62,5 +62,15 @@
"brandlink": "index.html",
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
"primtype": null
}
},
#{
# "source": {"$import": "userguide-draft4-input.json"},
# "target": "draft-4/UserGuide.html",
# "renderlist": [],
# "redirect": [],
# "brandlink": "index.html",
# "brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
# "primtype": null
#}

]
158 changes: 135 additions & 23 deletions cwltool/schemas/site/draft3-deps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,75 +2,187 @@
{
"secondaryFiles": [
{
"basename": "concepts.md",
"class": "File",
"location": "../draft-3/concepts.md"
},
{
"entry": {
"class": "Directory",
"listing": [
{
"entry": {
"basename": "salad",
"location": "_:0600cfcc-4e4b-4213-a821-1009e8a44f5a",
"class": "Directory",
"listing": [
{
"basename": "schema_salad",
"location": "_:1b18d943-4f8f-4c39-80ba-b30d2656d64e",
"class": "Directory",
"listing": [
{
"basename": "metaschema",
"location": "_:ae5f64e3-e9d7-41db-b59e-97c1611182ee",
"class": "Directory",
"listing": [
{
"entry": {
"class": "Directory",
"listing": [
{$import: draft3-metaschema.json}
]
},
"entryname": "metaschema"
"secondaryFiles": [
{
"secondaryFiles": [
{
"basename": "link_res_schema.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/link_res_schema.yml"
},
{
"basename": "link_res_src.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/link_res_src.yml"
},
{
"basename": "link_res_proc.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/link_res_proc.yml"
}
],
"basename": "link_res.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/link_res.yml"
},
{
"basename": "salad.md",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/salad.md"
},
{
"basename": "import_include.md",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/import_include.md"
},
{
"secondaryFiles": [
{
"basename": "field_name_src.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/field_name_src.yml"
},
{
"basename": "field_name_schema.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/field_name_schema.yml"
},
{
"basename": "field_name_proc.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/field_name_proc.yml"
}
],
"basename": "field_name.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/field_name.yml"
},
{
"secondaryFiles": [
{
"basename": "ident_res_proc.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/ident_res_proc.yml"
},
{
"basename": "ident_res_schema.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/ident_res_schema.yml"
},
{
"basename": "ident_res_src.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/ident_res_src.yml"
}
],
"basename": "ident_res.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/ident_res.yml"
},
{
"secondaryFiles": [
{
"basename": "vocab_res_schema.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/vocab_res_schema.yml"
},
{
"basename": "vocab_res_proc.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/vocab_res_proc.yml"
},
{
"basename": "vocab_res_src.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/vocab_res_src.yml"
}
],
"basename": "vocab_res.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/vocab_res.yml"
}
],
"basename": "metaschema.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/metaschema.yml"
}
]
},
"entryname": "schema_salad"
}
]
},
"entryname": "salad"
}
]
}
]
}
],
"basename": "Process.yml",
"class": "File",
"location": "../draft-3/Process.yml"
},
{
"secondaryFiles": [
{
"basename": "contrib.md",
"class": "File",
"location": "../draft-3/contrib.md"
},
{
"basename": "concepts.md",
"class": "File",
"location": "../draft-3/intro.md"
"location": "../draft-3/concepts.md"
},
{
"basename": "invocation.md",
"class": "File",
"location": "../draft-3/concepts.md"
"location": "../draft-3/invocation.md"
},
{
"basename": "intro.md",
"class": "File",
"location": "../draft-3/invocation.md"
"location": "../draft-3/intro.md"
}
],
"basename": "CommandLineTool.yml",
"class": "File",
"location": "../draft-3/CommandLineTool.yml"
},
{
"secondaryFiles": [
{
"basename": "contrib.md",
"class": "File",
"location": "../draft-3/contrib.md"
},
{
"basename": "concepts.md",
"class": "File",
"location": "../draft-3/intro.md"
"location": "../draft-3/concepts.md"
},
{
"basename": "intro.md",
"class": "File",
"location": "../draft-3/concepts.md"
"location": "../draft-3/intro.md"
}
],
"basename": "Workflow.yml",
"class": "File",
"location": "../draft-3/Workflow.yml"
}
Expand Down
104 changes: 104 additions & 0 deletions cwltool/schemas/site/draft3-metaschema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"secondaryFiles": [
{
"secondaryFiles": [
{
"basename": "link_res_schema.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/link_res_schema.yml"
},
{
"basename": "link_res_src.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/link_res_src.yml"
},
{
"basename": "link_res_proc.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/link_res_proc.yml"
}
],
"basename": "link_res.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/link_res.yml"
},
{
"basename": "salad.md",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/salad.md"
},
{
"basename": "import_include.md",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/import_include.md"
},
{
"secondaryFiles": [
{
"basename": "field_name_src.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/field_name_src.yml"
},
{
"basename": "field_name_schema.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/field_name_schema.yml"
},
{
"basename": "field_name_proc.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/field_name_proc.yml"
}
],
"basename": "field_name.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/field_name.yml"
},
{
"secondaryFiles": [
{
"basename": "ident_res_proc.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/ident_res_proc.yml"
},
{
"basename": "ident_res_schema.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/ident_res_schema.yml"
},
{
"basename": "ident_res_src.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/ident_res_src.yml"
}
],
"basename": "ident_res.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/ident_res.yml"
},
{
"secondaryFiles": [
{
"basename": "vocab_res_schema.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/vocab_res_schema.yml"
},
{
"basename": "vocab_res_proc.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/vocab_res_proc.yml"
},
{
"basename": "vocab_res_src.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/vocab_res_src.yml"
}
],
"basename": "vocab_res.yml",
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/vocab_res.yml"
}
],
"class": "File",
"location": "../draft-3/salad/schema_salad/metaschema/metaschema.yml"
}
Loading