Skip to content
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.

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

refresh from 1.2.1-proposed #14

Merged
merged 74 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
31ec48a
Backport formatting fixes (#210)
mr-c Nov 9, 2022
e4bb3bf
fix typo in ResourceRequirement.coresMin description (#214)
fmigneault Dec 2, 2022
ad6f77c
fix workflow scatter typos (#215)
fmigneault Dec 4, 2022
f6172e5
Two tests were accidently still specifying v1.0 (#217)
mr-c Dec 29, 2022
ee06bc0
Add missing `label` field
tom-tan May 21, 2022
a507314
backport labels for some conditional tests
mr-c Jan 9, 2023
f79146f
Increase the timeout in the time limit test
tetron Jan 25, 2023
bcf1d89
Create dependabot.yml
mr-c Feb 13, 2023
fd53d9d
Added conformance tests for File and Directory glob
GlassOfWhiskey Feb 12, 2023
83c7208
add hyperlinks to intent definition
mr-c Feb 13, 2023
020e70d
Bump rojopolis/spellcheck-github-actions from 0.23.0 to 0.29.0
dependabot[bot] Feb 13, 2023
c15357a
Bump actions/setup-python from 2 to 4
dependabot[bot] Feb 13, 2023
d1c2e2c
Bump actions/checkout from 2 to 3
dependabot[bot] Feb 13, 2023
7052da7
ci: use cwltest pytest plugin for better speed
mr-c Feb 13, 2023
bd5d12f
Bump rojopolis/spellcheck-github-actions from 0.29.0 to 0.30.0
dependabot[bot] Feb 27, 2023
5411b8c
Fixed MacOS X compatibility for wc-tool
GlassOfWhiskey Mar 3, 2023
e136888
Document that ExpressionTool outputs are always valid
GlassOfWhiskey Mar 4, 2023
192bb32
add render script
mr-c Apr 17, 2023
e750ef2
Merge remote-tracking branch 'origin/main' into 1.2.1_proposed
mr-c Apr 17, 2023
2bb40f5
install cwltool when rendering
mr-c Apr 17, 2023
a75fbcb
also lockfile
mr-c Apr 17, 2023
e8508f8
render: skip docker
mr-c Apr 17, 2023
c928c98
render: re-use git checkout
mr-c Apr 18, 2023
92d0acd
official IANA media types for CWL documents
mr-c Apr 19, 2023
37a44af
spelling: check YAML docs
mr-c Apr 19, 2023
979accf
Fixes #193
GlassOfWhiskey Apr 17, 2023
63d4784
Substitute URI with IRI in docs
GlassOfWhiskey Apr 21, 2023
4f9b346
Add tests for decimal representation of very big and very small numbers
mr-c May 8, 2023
cbbf982
ci: add codespell check
mr-c May 8, 2023
3d01afe
sync metaschema
mr-c May 8, 2023
146f6fb
typos
mr-c May 9, 2023
ad91c84
Fix typo {} vs ()
mr-c May 10, 2023
3eeddca
Bump rojopolis/spellcheck-github-actions from 0.30.0 to 0.32.0
dependabot[bot] Jun 3, 2023
1529286
Bump codespell-project/actions-codespell from 1.0 to 2.0
dependabot[bot] May 15, 2023
2a06a42
Update requirements.txt
mr-c May 15, 2023
f64fec0
Update requirements.txt
mr-c Jun 3, 2023
4a715dd
All loadContents tests are required
mr-c Jun 5, 2023
d50fad0
default_with_falsey_value (#48)
mr-c Jun 5, 2023
c9d4ade
Bump rojopolis/spellcheck-github-actions from 0.32.0 to 0.33.0 (#257)
dependabot[bot] Jun 19, 2023
c2ac7e3
Increase the time limits of this test and add a note. (#260)
tetron Jul 10, 2023
53ea13c
Bump rojopolis/spellcheck-github-actions from 0.33.0 to 0.33.1 (#261)
dependabot[bot] Jul 17, 2023
dc098f0
fix run_tests indents + gitignore IDE/python files
fmigneault Jun 13, 2023
1612321
add CWL JSON schema + 'json_schema_invalid' tag (closes https://githu…
fmigneault Jun 13, 2023
1ce7236
changelog for 7b4b85...350f0b
mr-c Jul 22, 2023
9351742
json_output_{path,location}_relative: remove need for ShellCommandReq…
mr-c Jul 23, 2023
180486e
changelog 350f0b...1612321
mr-c Jul 23, 2023
fa6d28f
address review comments
mr-c Jul 24, 2023
f368628
add conformance test for nested types in SchemaDefRequirement
jdidion Feb 3, 2021
5f84b9a
remove last references to Python 2
mr-c Aug 17, 2023
df6fd28
add explicit docker repository where missing
mr-c Aug 17, 2023
01f2ee6
test for parameter references in CommandLineTool.arguments
mr-c Aug 17, 2023
63d914b
gh-actions: split out JSON schema validation
mr-c Aug 21, 2023
c6c9be6
update the changelogs through 01f2ee6.
mr-c Aug 28, 2023
1aa4a87
add missing Any? and Any[]? CWL types to JSON schema
fmigneault Aug 28, 2023
c0cc7bb
add missing ruamel.yaml package for JSON schema tests
fmigneault Aug 28, 2023
a4e0aa4
tests: conditionals: add 2 missing doc strings
mr-c Sep 7, 2023
5f4a24c
record_order_with_input_bindings had wrong tag
mr-c Sep 7, 2023
31bda22
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 11, 2023
cf52780
Bump rojopolis/spellcheck-github-actions from 0.33.1 to 0.34.0
dependabot[bot] Oct 2, 2023
bd9e228
address review comments
mr-c Oct 30, 2023
28803b0
spelling fix
mr-c Oct 30, 2023
0d538a0
json tests: adapt to newer ruamel.yaml
mr-c Oct 30, 2023
1606e54
Bump rojopolis/spellcheck-github-actions from 0.34.0 to 0.35.0
dependabot[bot] Nov 20, 2023
504ccbe
Bump actions/setup-python from 4 to 5
dependabot[bot] Dec 11, 2023
ae6899d
Merge pull request #115 from common-workflow-language/1.2.1_proposed
mr-c Jan 3, 2024
0e11c1f
start development of CWL v1.3.0-dev1
mr-c Jun 8, 2021
277b56d
Bump test version to v1.3.0-dev1
GlassOfWhiskey Dec 28, 2022
b9f1506
update the mixed-versions tests for v1.3.0-dev1
mr-c Dec 29, 2022
f14aa30
Sink type refactoring
GlassOfWhiskey Dec 28, 2022
4cf7e7a
Merge branch 'main' into refresh_from_1.2.1-proposed
tetron May 16, 2024
eb28505
Add InputSink/OutputSink to wordlist
tetron May 16, 2024
5ded0e1
install from cwltool v1.3 branch
tetron May 16, 2024
909141b
Use git+https to get cwltool dev branch
tetron May 16, 2024
40324bd
Update egg
tetron May 16, 2024
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
3 changes: 2 additions & 1 deletion .github/config/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ matrix:
ignores:
- :matches(code, pre)
sources:
- '**/*.md'
- '!env*/**|**/*.md'
- '!env*/**|!tests/**|*.yml'
default_encoding: utf-8
154 changes: 152 additions & 2 deletions .github/config/wordlist.txt
Original file line number Diff line number Diff line change
@@ -1,51 +1,114 @@
acyclic
amstutz
arrayschema
arvados
auditability
autogenerated
avro
backchannel
backrub
basecommand
basedir
basename
basetypesdoc
bioconda
bioinformatics
bnf
bogdan
bowtie
changelog
charette
checkpoint
checkpointing
checksums
chilton
cisphobia
classname
cmd
commandinputarrayschema
commandinputenumschema
commandinputparameter
commandinputrecordfield
commandinputrecordschema
commandinputschema
commandlinebindable
commandlinebinding
commandlinetool
commandlinetooldoc
commandlinetools
commandoutputarrayschema
commandoutputbinding
commandoutputenumschema
commandoutputparameter
commandoutputrecordfield
commandoutputrecordschema
commonwl
conformant
contrib
complextype
coresMin
coreutils
cpus
crossproduct
cryptographic
ctbrown
curii
curoverse
cwl
cwltest
cwltool
cwltype
cwlversion
cyclic
dataflow
deserialize
dev
dirent
docafter
docchild
dockerfile
dockerimport
dockerload
dockeroutputdirectory
dockerpull
dockerrequirement
documentroot
docparent
doi
dotproduct
doubleq
dsl
dusenbery
edu
eg
enablereuse
entryname
enum
enumschema
entrypoint
envdef
environmentdef
envname
envvalue
envvarrequirement
expressionlib
expressionplaceholder
expressiontool
expressiontooloutputparameter
expressiontools
fieldbase
filenameABCDEFG
filesystem
freedesktop
gavrilovic
geoscience
ghose
gitter
globbing
gmail
gunzip
hervé
https
iana
ietf
implementer
implementers
Expand All @@ -54,25 +117,51 @@ implementors
initialworkdirrequirement
initialworkdirrequirements
inlinejavascriptrequirement
inplaceupdate
inplaceupdaterequirement
inputarrayschema
inputenumschema
inputbinding
inputformat
inputrecordfield
inputrecordschema
inputparameter
inputschema
inputsink
institut
interoperable
invocab
ioschema
ipv
iri
itemseparator
jmchilton
json
jsonldpredicate
junit
kaushik
kib
ld
lexicographically
linkmerge
linkmergemethod
loadcontents
loadlisting
loadlistingenum
loadlistingrequirement
localhost
lookahead
loopback
maccallum
macos
mappredicate
mapsubject
mebibyte
mebibytes
ménager
metacharacters
metaschema
migneault
misgendering
mrc
multipleinputfeaturerequirement
Expand All @@ -84,43 +173,81 @@ nebojša
nekrutenko
networkaccess
neuro
nolinkcheck
ogc
onlinepubs
opengroup
operationinputparameter
operationoutputparameter
orcid
osx
outputarrayschema
outputbinding
outputenumschema
outputeval
outputformat
outputschema
outputsink
outputsource
outputparameter
outputrecordfield
outputrecordschema
parsers
pathname
petermac
pickvalue
pickvaluemethod
posix
pre
preprocess
preprocessed
preprocessing
primitivetype
processrequirement
psu
publically
pvanheus
rdf
rdfs
recordfield
recordschema
recurse
refscope
repo
reproducibility
resolvers
resourcerequirement
routable
rrid
runtime
saladversion
sbgenomics
scatterfeaturerequirement
scattermethod
schemadefrequirement
schemaorg
schemas
scr
secondaryfiles
secondaryfileschema
secondaryfilesdsl
semver
shellcommandrequirement
singleq
sld
specializeto
specializefrom
softwarepackage
softwarerequirement
soiland
stderr
stdin
stdout
stepinputexpressionrequirement
stian
streamable
subdirectories
subdirectory
subnet
subprocess
subprocesses
subscope
Expand All @@ -132,24 +259,47 @@ substrings
subtype
subtypes
subworkflow
subworkflows
subworkflowfeaturerequirement
subworkflowrequirement
superset
svg
symlink
tbb
testcase
tijanic
tijanić
timelimit
toc
tooltimelimit
transcode
txt
typedef
typedsl
undeploy
unserialized
uc
ucdavis
udocker
underspecified
untrusted
updatable
uri
utf
valuefrom
vandewege
virtualenv
virtualized
walkthrough
wdl
whitespace
workflowdoc
workflowinputparameter
workflowoutputparameter
workflowstep
workflowstepinput
workflowstepoutput
workreuse
xdg
yaml
yml
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
21 changes: 18 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.8.x'

- name: Setup prerequirements
run: pip install cwltest schema-salad[pycodegen]
run: pip install cwltest 'schema-salad[pycodegen]'

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

- name: Validate CWL documents
run: ./run_test.sh --self

validate_json:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: '3.8.x'

- name: Validate JSON schema document
run: |
pip install -r ./requirements-jsonschema-test.txt
pytest tests/json_schema
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/cwltool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,23 @@ on:
jobs:
test_with_cwltool:
runs-on: ubuntu-latest

env:
CWLTOOL_OPTIONS: "--parallel --relax-path-checks --enable-dev"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.9.x'

- name: Setup prerequirements
run: pip install cwltest "https://github.com/common-workflow-language/cwltool/archive/refs/heads/cwl-v1.3.zip"

run: pip install "cwltest>=2.3" pytest-xdist "git+https://github.com/common-workflow-language/[email protected]#egg=cwltool"

- name: Copy in cwltool-specific configuration for the cwltest pytest plugin
run: cp "$(python -c 'from cwltool.tests.util import get_data; print(get_data("tests/cwl-conformance/cwltool-conftest.py"))')" conftest.py

- name: Copy conformance test index to .cwltest.yaml
run: cp conformance_tests.yaml conformance_tests.cwltest.yaml

- name: Run tests against the reference runner
run: ./run_test.sh RUNNER=cwltool "EXTRA=--parallel --relax-path-checks --enable-dev" -j$(nproc)
run: python -m pytest conformance_tests.cwltest.yaml -n auto -rs
Loading