Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions cwl_utils/parser/cwl_v1_0.py
Original file line number Diff line number Diff line change
Expand Up @@ -4035,7 +4035,7 @@ class Directory(Saveable):
the same Directory.

When executing a CommandLineTool, Directories must be recursively staged
first and have local values of `path` assigend.
first and have local values of `path` assigned.

Directory objects in CommandLineTool output must provide either a
`location` URI or a `path` property in the context of the tool execution
Expand Down Expand Up @@ -16266,7 +16266,7 @@ class ShellCommandRequirement(ProcessRequirement):
Modify the behavior of CommandLineTool to generate a single string
containing a shell command line. Each item in the argument list must be
joined into a string separated by single spaces and quoted to prevent
intepretation by the shell, unless `CommandLineBinding` for that argument
interpretation by the shell, unless `CommandLineBinding` for that argument
contains `shellQuote: false`. If `shellQuote: false` is specified, the
argument is joined into the command string without quoting, which allows
the use of shell metacharacters such as `|` for pipes.
Expand Down Expand Up @@ -20275,7 +20275,7 @@ class Workflow(Process):
The `source` field expresses the dependency of one parameter on another
such that when a value is associated with the parameter specified by
`source`, that value is propagated to the destination parameter. When all
data links inbound to a given step are fufilled, the step is ready to
data links inbound to a given step are fulfilled, the step is ready to
execute.

## Workflow success and failure
Expand Down
14 changes: 7 additions & 7 deletions cwl_utils/parser/cwl_v1_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -4035,7 +4035,7 @@ class Directory(Saveable):
the same Directory.

When executing a CommandLineTool, Directories must be recursively staged
first and have local values of `path` assigend.
first and have local values of `path` assigned.

Directory objects in CommandLineTool output must provide either a
`location` URI or a `path` property in the context of the tool execution
Expand Down Expand Up @@ -17590,7 +17590,7 @@ class ShellCommandRequirement(ProcessRequirement):
Modify the behavior of CommandLineTool to generate a single string
containing a shell command line. Each item in the argument list must be
joined into a string separated by single spaces and quoted to prevent
intepretation by the shell, unless `CommandLineBinding` for that argument
interpretation by the shell, unless `CommandLineBinding` for that argument
contains `shellQuote: false`. If `shellQuote: false` is specified, the
argument is joined into the command string without quoting, which allows
the use of shell metacharacters such as `|` for pipes.
Expand Down Expand Up @@ -18331,7 +18331,7 @@ class WorkReuse(ProcessRequirement):
For implementations that support reusing output from past work (on
the assumption that same code and same input produce same
results), control whether to enable or disable the reuse behavior
for a particular tool or step (to accomodate situations where that
for a particular tool or step (to accommodate situations where that
assumption is incorrect). A reused step is not executed but
instead returns the same output as the original execution.

Expand Down Expand Up @@ -18529,7 +18529,7 @@ class NetworkAccess(ProcessRequirement):
may apply their own security policies to restrict what is
accessible by the tool.

Enabling network access does not imply a publically routable IP
Enabling network access does not imply a publicly routable IP
address or the ability to accept inbound connections.

"""
Expand Down Expand Up @@ -18727,7 +18727,7 @@ class InplaceUpdateRequirement(ProcessRequirement):
read-only in every step.

Workflow steps which modify a file must produce the modified file
as output. Downstream steps which futher process the file must
as output. Downstream steps which further process the file must
use the output of previous steps, and not refer to a common input
(this is necessary for both ordering and correctness).

Expand Down Expand Up @@ -21672,7 +21672,7 @@ class WorkflowStepInput(IdentifierRequired, Sink, LoadContents, Labeled):
workflow inputs, or the outputs of other workflows steps) with the input
parameters of the process specified by the `run` field. Only input parameters
declared by the target process will be passed through at runtime to the process
though additonal parameters may be specified (for use within `valueFrom`
though additional parameters may be specified (for use within `valueFrom`
expressions for instance) - unconnected or unused parameters do not represent an
error condition.

Expand Down Expand Up @@ -23210,7 +23210,7 @@ class Workflow(Process):
The `source` field expresses the dependency of one parameter on another
such that when a value is associated with the parameter specified by
`source`, that value is propagated to the destination parameter. When all
data links inbound to a given step are fufilled, the step is ready to
data links inbound to a given step are fulfilled, the step is ready to
execute.

## Workflow success and failure
Expand Down
4 changes: 2 additions & 2 deletions cwl_utils/templates/WorkflowInputJsonSchemaTemplate.md
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ def add_cwl_metadata_to_schema(schema_dict: Dict) -> Dict:
# Always do a deepcopy on the input
schema_dict = deepcopy(schema_dict)

# Assert defintions
# Assert definitions
assert_definitions_key(schema_dict)

# Add in the CWL metadata to the definitions
Expand Down Expand Up @@ -1059,7 +1059,7 @@ def fix_hints(schema_dict, definition_key):

def add_file_and_directory_to_schema(schema_dict: Dict) -> Dict:
"""
Add file and directory defintions to schema
Add file and directory definitions to schema
:param schema_dict:
:return:
"""
Expand Down
4 changes: 2 additions & 2 deletions cwl_utils/testdata/EDAM_subset.owl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<oboInOwl:hasSubset>data &quot;EDAM types of data&quot;</oboInOwl:hasSubset>
<oboInOwl:hasSubset>relations &quot;EDAM relations&quot;</oboInOwl:hasSubset>
<oboInOwl:hasSubset>edam &quot;EDAM&quot;</oboInOwl:hasSubset>
<oboOther:remark>EDAM editors: Jon Ison, Matus Kalas, and Herve Menager. Contributors: Inge Jonassen, Dan Bolser, Hamish McWilliam, Mahmut Uludag, James Malone, Rodrigo Lopez, Steve Pettifer, and Peter Rice. Contibutions from these projects: EMBRACE, ELIXIR, and BioMedBridges (EU); EMBOSS (BBSRC, UK); eSysbio, FUGE Bioinformatics Platform, and ELIXIR.NO/Norwegian Bioinformatics Platform (Research Council of Norway). See http://edamontology.org for documentation and licence.</oboOther:remark>
<oboOther:remark>EDAM editors: Jon Ison, Matus Kalas, and Herve Menager. Contributors: Inge Jonassen, Dan Bolser, Hamish McWilliam, Mahmut Uludag, James Malone, Rodrigo Lopez, Steve Pettifer, and Peter Rice. Contributions from these projects: EMBRACE, ELIXIR, and BioMedBridges (EU); EMBOSS (BBSRC, UK); eSysbio, FUGE Bioinformatics Platform, and ELIXIR.NO/Norwegian Bioinformatics Platform (Research Council of Norway). See http://edamontology.org for documentation and licence.</oboOther:remark>
<oboInOwl:hasSubset>operations &quot;EDAM operations&quot;</oboInOwl:hasSubset>
<oboOther:idspace>EDAM http://edamontology.org/ &quot;EDAM relations and concept properties&quot;</oboOther:idspace>
<dc:format>application/rdf+xml</dc:format>
Expand Down Expand Up @@ -97,7 +97,7 @@

<owl:AnnotationProperty rdf:about="http://edamontology.org/example">
<rdfs:label>Example</rdfs:label>
<oboInOwl:hasDefinition>&apos;Example&apos; concept property (&apos;example&apos; metadat tag) lists examples of valid values of types of identifiers (accessions). Applicable to some other types of data, too.</oboInOwl:hasDefinition>
<oboInOwl:hasDefinition>&apos;Example&apos; concept property (&apos;example&apos; metadata tag) lists examples of valid values of types of identifiers (accessions). Applicable to some other types of data, too.</oboInOwl:hasDefinition>
<oboOther:is_metadata_tag>true</oboOther:is_metadata_tag>
<oboInOwl:inSubset>concept_properties</oboInOwl:inSubset>
</owl:AnnotationProperty>
Expand Down
2 changes: 1 addition & 1 deletion cwl_utils/testdata/revsort-run-1-packed.cwl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{
"type": "boolean",
"default": true,
"doc": "If true, reverse (decending) sort",
"doc": "If true, reverse (descending) sort",
"id": "#main/reverse_sort"
}
],
Expand Down
4 changes: 2 additions & 2 deletions lint-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
flake8-bugbear < 25.12
black == 25.*
codespell
codespell == 2.4.1
flake8-bugbear < 25.12
isort >= 5
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,6 @@ ignore = [

[tool.bandit]
exclude_dirs = ["cwl_utils/tests"]

[tool.codespell]
ignore-words-list = "afile"
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ commands =
py3{10,11,12,13,14}-unit: python -m pip install -U pip setuptools wheel
py3{10,11,12,13,14}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
py3{10,11,12,13,14}-bandit: bandit --configfile pyproject.toml --recursive cwl_utils
py3{10,11,12,13,14}-lint: make flake8
py3{10,11,12,13,14}-lint: make format-check
py3{10,11,12,13,14}-lint: make flake8 format-check codespell-check
py3{10,11,12,13,14}-mypy: make mypy

allowlist_externals =
Expand Down
Loading