Skip to content

Commit 21f93fa

Browse files
authored
Merge pull request #14 from common-workflow-language/refresh_from_1.2.1-proposed
refresh from 1.2.1-proposed
2 parents 55f3063 + 40324bd commit 21f93fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3399
-115
lines changed

.github/config/spellcheck.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ matrix:
1717
ignores:
1818
- :matches(code, pre)
1919
sources:
20-
- '**/*.md'
20+
- '!env*/**|**/*.md'
21+
- '!env*/**|!tests/**|*.yml'
2122
default_encoding: utf-8

.github/config/wordlist.txt

Lines changed: 152 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,114 @@
11
acyclic
22
amstutz
3+
arrayschema
34
arvados
45
auditability
6+
autogenerated
57
avro
68
backchannel
79
backrub
10+
basecommand
811
basedir
12+
basename
13+
basetypesdoc
14+
bioconda
15+
bioinformatics
916
bnf
1017
bogdan
18+
bowtie
19+
changelog
20+
charette
1121
checkpoint
1222
checkpointing
23+
checksums
1324
chilton
1425
cisphobia
1526
classname
27+
cmd
28+
commandinputarrayschema
29+
commandinputenumschema
30+
commandinputparameter
31+
commandinputrecordfield
32+
commandinputrecordschema
33+
commandinputschema
34+
commandlinebindable
35+
commandlinebinding
1636
commandlinetool
37+
commandlinetooldoc
1738
commandlinetools
39+
commandoutputarrayschema
40+
commandoutputbinding
41+
commandoutputenumschema
42+
commandoutputparameter
43+
commandoutputrecordfield
44+
commandoutputrecordschema
1845
commonwl
46+
conformant
47+
contrib
1948
complextype
49+
coresMin
2050
coreutils
51+
cpus
52+
crossproduct
53+
cryptographic
2154
ctbrown
2255
curii
23-
curoverse
2456
cwl
2557
cwltest
2658
cwltool
59+
cwltype
2760
cwlversion
2861
cyclic
2962
dataflow
63+
deserialize
3064
dev
65+
dirent
66+
docafter
67+
docchild
68+
dockerfile
69+
dockerimport
70+
dockerload
71+
dockeroutputdirectory
72+
dockerpull
3173
dockerrequirement
74+
documentroot
75+
docparent
76+
doi
77+
dotproduct
3278
doubleq
3379
dsl
3480
dusenbery
3581
edu
3682
eg
83+
enablereuse
84+
entryname
85+
enum
86+
enumschema
87+
entrypoint
88+
envdef
89+
environmentdef
90+
envname
91+
envvalue
3792
envvarrequirement
3893
expressionlib
94+
expressionplaceholder
3995
expressiontool
96+
expressiontooloutputparameter
4097
expressiontools
98+
fieldbase
99+
filenameABCDEFG
41100
filesystem
42101
freedesktop
43102
gavrilovic
103+
geoscience
44104
ghose
45105
gitter
106+
globbing
46107
gmail
108+
gunzip
47109
hervé
48110
https
111+
iana
49112
ietf
50113
implementer
51114
implementers
@@ -54,25 +117,51 @@ implementors
54117
initialworkdirrequirement
55118
initialworkdirrequirements
56119
inlinejavascriptrequirement
120+
inplaceupdate
57121
inplaceupdaterequirement
122+
inputarrayschema
123+
inputenumschema
124+
inputbinding
125+
inputformat
126+
inputrecordfield
127+
inputrecordschema
58128
inputparameter
129+
inputschema
130+
inputsink
59131
institut
132+
interoperable
60133
invocab
134+
ioschema
135+
ipv
61136
iri
137+
itemseparator
62138
jmchilton
63139
json
140+
jsonldpredicate
64141
junit
65142
kaushik
143+
kib
66144
ld
67145
lexicographically
68146
linkmerge
147+
linkmergemethod
148+
loadcontents
149+
loadlisting
150+
loadlistingenum
151+
loadlistingrequirement
152+
localhost
69153
lookahead
154+
loopback
70155
maccallum
71156
macos
157+
mappredicate
158+
mapsubject
72159
mebibyte
73160
mebibytes
74161
ménager
162+
metacharacters
75163
metaschema
164+
migneault
76165
misgendering
77166
mrc
78167
multipleinputfeaturerequirement
@@ -84,43 +173,81 @@ nebojša
84173
nekrutenko
85174
networkaccess
86175
neuro
176+
nolinkcheck
177+
ogc
87178
onlinepubs
88179
opengroup
180+
operationinputparameter
181+
operationoutputparameter
89182
orcid
90183
osx
184+
outputarrayschema
185+
outputbinding
186+
outputenumschema
187+
outputeval
188+
outputformat
189+
outputschema
190+
outputsink
91191
outputsource
192+
outputparameter
193+
outputrecordfield
194+
outputrecordschema
195+
parsers
196+
pathname
92197
petermac
93198
pickvalue
199+
pickvaluemethod
94200
posix
95201
pre
96202
preprocess
97203
preprocessed
98204
preprocessing
205+
primitivetype
206+
processrequirement
99207
psu
100-
publically
101208
pvanheus
102209
rdf
210+
rdfs
211+
recordfield
212+
recordschema
103213
recurse
214+
refscope
104215
repo
105216
reproducibility
217+
resolvers
106218
resourcerequirement
107219
routable
220+
rrid
108221
runtime
222+
saladversion
109223
sbgenomics
110224
scatterfeaturerequirement
225+
scattermethod
111226
schemadefrequirement
112227
schemaorg
113228
schemas
229+
scr
114230
secondaryfiles
231+
secondaryfileschema
115232
secondaryfilesdsl
233+
semver
116234
shellcommandrequirement
117235
singleq
236+
sld
237+
specializeto
238+
specializefrom
118239
softwarepackage
119240
softwarerequirement
120241
soiland
242+
stderr
243+
stdin
244+
stdout
121245
stepinputexpressionrequirement
122246
stian
247+
streamable
248+
subdirectories
123249
subdirectory
250+
subnet
124251
subprocess
125252
subprocesses
126253
subscope
@@ -132,24 +259,47 @@ substrings
132259
subtype
133260
subtypes
134261
subworkflow
262+
subworkflows
263+
subworkflowfeaturerequirement
135264
subworkflowrequirement
136265
superset
137266
svg
267+
symlink
268+
tbb
269+
testcase
138270
tijanic
139271
tijanić
272+
timelimit
140273
toc
141274
tooltimelimit
142275
transcode
143276
txt
277+
typedef
278+
typedsl
279+
undeploy
280+
unserialized
144281
uc
145282
ucdavis
283+
udocker
284+
underspecified
146285
untrusted
286+
updatable
147287
uri
148288
utf
289+
valuefrom
149290
vandewege
150291
virtualenv
292+
virtualized
151293
walkthrough
152294
wdl
153295
whitespace
296+
workflowdoc
297+
workflowinputparameter
298+
workflowoutputparameter
299+
workflowstep
300+
workflowstepinput
301+
workflowstepoutput
302+
workreuse
154303
xdg
155304
yaml
305+
yml

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "github-actions" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

.github/workflows/ci.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222

23-
- uses: actions/setup-python@v2
23+
- uses: actions/setup-python@v5
2424
with:
2525
python-version: '3.8.x'
2626

2727
- name: Setup prerequirements
28-
run: pip install cwltest schema-salad[pycodegen]
28+
run: pip install cwltest 'schema-salad[pycodegen]'
2929

3030
- name: Download schema for conformance_tests.yaml
3131
run: curl -LO https://raw.githubusercontent.com/common-workflow-language/cwltest/main/cwltest/cwltest-schema.yml
@@ -35,3 +35,18 @@ jobs:
3535

3636
- name: Validate CWL documents
3737
run: ./run_test.sh --self
38+
39+
validate_json:
40+
runs-on: ubuntu-latest
41+
42+
steps:
43+
- uses: actions/checkout@v4
44+
45+
- uses: actions/setup-python@v5
46+
with:
47+
python-version: '3.8.x'
48+
49+
- name: Validate JSON schema document
50+
run: |
51+
pip install -r ./requirements-jsonschema-test.txt
52+
pytest tests/json_schema

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Initialize CodeQL
3030
uses: github/codeql-action/init@v2

.github/workflows/cwltool.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,23 @@ on:
1414
jobs:
1515
test_with_cwltool:
1616
runs-on: ubuntu-latest
17-
17+
env:
18+
CWLTOOL_OPTIONS: "--parallel --relax-path-checks --enable-dev"
1819
steps:
19-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2021

21-
- uses: actions/setup-python@v2
22+
- uses: actions/setup-python@v5
2223
with:
2324
python-version: '3.9.x'
24-
25+
2526
- name: Setup prerequirements
26-
run: pip install cwltest "https://github.com/common-workflow-language/cwltool/archive/refs/heads/cwl-v1.3.zip"
27-
27+
run: pip install "cwltest>=2.3" pytest-xdist "git+https://github.com/common-workflow-language/[email protected]#egg=cwltool"
28+
29+
- name: Copy in cwltool-specific configuration for the cwltest pytest plugin
30+
run: cp "$(python -c 'from cwltool.tests.util import get_data; print(get_data("tests/cwl-conformance/cwltool-conftest.py"))')" conftest.py
31+
32+
- name: Copy conformance test index to .cwltest.yaml
33+
run: cp conformance_tests.yaml conformance_tests.cwltest.yaml
34+
2835
- name: Run tests against the reference runner
29-
run: ./run_test.sh RUNNER=cwltool "EXTRA=--parallel --relax-path-checks --enable-dev" -j$(nproc)
36+
run: python -m pytest conformance_tests.cwltest.yaml -n auto -rs

0 commit comments

Comments
 (0)