Skip to content

Commit 604c942

Browse files
committed
more HTTPS
1 parent 8a0dcfc commit 604c942

File tree

17 files changed

+100
-64
lines changed

17 files changed

+100
-64
lines changed

.zenodo.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"creators": [
88
{
99
"affiliation": "European Molecular Biology Laboratory",
10-
"orcid": "http://orcid.org/0000-0003-1766-456X",
10+
"orcid": "https://orcid.org/0000-0003-1766-456X",
1111
"name": "Toby Hodges"
1212
},
1313
{
1414
"affiliation": "Common Workflow Language project",
15-
"orcid": "http://orcid.org/0000-0002-2961-9670",
15+
"orcid": "https://orcid.org/0000-0002-2961-9670",
1616
"name": "Michael R. Crusoe"
1717
}
1818
],

CITATION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ https://dx.doi.org/10.6084/m9.figshare.3115156.v2
1111

1212
@data{cwl,
1313
doi = {10.6084/m9.figshare.3115156.v2},
14-
url = {http://dx.doi.org/10.6084/m9.figshare.3115156.v2},
14+
url = {https://doi.org/10.6084/m9.figshare.3115156.v2},
1515
author = {Peter Amstutz; Michael R. Crusoe; Nebojša Tijanić; Brad Chapman;
1616
John Chilton; Michael Heuer; Andrey Kartashov; John Kern; Dan Leehr;
1717
Hervé Ménager; Maya Nedeljkovich; Matt Scales; Stian Soiland-Reyes;

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ and to meet some of our community members.
4747

4848
1. If you wish to change this lesson,
4949
please work in <https://github.com/common-workflow-language/user_guide>,
50-
which can be viewed at <http://www.commmonwl.org/user_guide/>.
50+
which can be viewed at <https://www.commmonwl.org/user_guide/>.
5151

5252
2. If you wish to change the example lesson,
5353
please work in <https://github.com/swcarpentry/lesson-example>,
@@ -134,13 +134,13 @@ which everyone is welcome to join.
134134
[dc-lessons]: http://datacarpentry.org/lessons/
135135
[dc-site]: http://datacarpentry.org/
136136
[discuss-list]: https://groups.google.com/forum/#!forum/common-workflow-language
137-
[github]: http://github.com
137+
[github]: https://github.com
138138
[github-flow]: https://guides.github.com/introduction/flow/
139139
[github-join]: https://github.com/join
140140
[how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github
141141
[issues]: https://github.com/common-workflow-language/user_guide/issues
142142
[repo]: https://github.com/common-workflow-language/user_guide
143143
[swc-issues]: https://github.com/issues?q=user%3Aswcarpentry
144-
[swc-lessons]: http://software-carpentry.org/lessons/
145-
[swc-site]: http://software-carpentry.org/
146-
[cwl-site]: http://www.commonwl.org/
144+
[swc-lessons]: https://software-carpentry.org/lessons/
145+
[swc-site]: https://software-carpentry.org/
146+
[cwl-site]: https://www.commonwl.org/

LICENSE.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
layout: page
33
title: "Licenses"
4-
permalink: /license/
54
---
65
## Instructional Material
76

@@ -30,7 +29,7 @@ Under the following terms:
3029
* **Attribution**---You must give appropriate credit (mentioning that
3130
your work is derived from work that is Copyright © the Common Workflow
3231
Language project, and Copyright © Software Carpentry, and, where practical, linking to
33-
http://www.commonwl.org/ and http://software-carpentry.org/), provide a [link to the
32+
https://www.commonwl.org/ and https://software-carpentry.org/), provide a [link to the
3433
license][cc-by-human], and indicate if changes were made. You may do
3534
so in any reasonable manner, but not in any way that suggests the
3635
licensor endorses you or your use.
@@ -70,5 +69,5 @@ are registered trademarks of [NumFOCUS][numfocus].
7069
[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
7170
[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
7271
[apache-2.0-license]: https://opensource.org/licenses/Apache-2.0
73-
[numfocus]: http://numfocus.org/
74-
[osi]: http://opensource.org
72+
[numfocus]: https://numfocus.org/
73+
[osi]: https://opensource.org

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Syntax Check](https://travis-ci.org/common-workflow-language/user_guide.svg?branch=gh-pages)](https://travis-ci.org/common-workflow-language/user_guide)
44

5-
[User guide for CWL v1.0.1](http://www.commonwl.org/user_guide/)
5+
[User guide for CWL v1.0.2](https://www.commonwl.org/user_guide/)
66

77
Original source:
88
https://github.com/common-workflow-language/common-workflow-language/blob/a2a8a08b8c8d56f8f2ca6284ca4e9cbf23d19346/v1.0/UserGuide.yml

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ title: "Common Workflow Language User Guide"
1111
# Contact. This *must* include the protocol: if it's an email
1212
# address, it must look like "mailto:[email protected]",
1313
# or if it's a URL, "https://gitter.im/username/ProjectName".
14-
email: "http://www.commonwl.org/#Support"
14+
email: "https://www.commonwl.org/#Support"
1515

1616
#------------------------------------------------------------
1717
# Generic settings (should not need to change).

_episodes/02-1st-example.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,5 @@ outputs: []
8080

8181
This tool has no formal output, so the `outputs` section is an empty list.
8282

83-
[json]: http://json.org
84-
[yaml]: http://yaml.org
83+
[json]: https://json.org
8584
{% include links.md %}

_episodes/08-arguments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ designated output directory. Other parameters include `$(runtime.tmpdir)`,
9191
`$(runtime.tmpdirSize)`. See the [Runtime Environment][runtime] section of the
9292
CWL specification for details.
9393

94-
[runtime]: http://www.commonwl.org/v1.0/CommandLineTool.html#Runtime_environment
94+
[runtime]: https://www.commonwl.org/v1.0/CommandLineTool.html#Runtime_environment
9595
{% include links.md %}

_episodes/13-expressions.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,36 +90,36 @@ syntax is used to describe the additional command line arguments.
9090
> Just like [parameter references]({{ page.root }}{% link _episodes/06-params.md %}), you can use JavaScript Expressions
9191
> only in certain fields. These are:
9292
>
93-
> - From [`CommandLineTool`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool)
93+
> - From [`CommandLineTool`](https://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineTool)
9494
> - `arguments`
9595
> - `valueFrom`
9696
> - `stdin`
9797
> - `stdout`
9898
> - `stderr`
99-
> - From [CommandInputParameter](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter)
99+
> - From [CommandInputParameter](https://www.commonwl.org/v1.0/CommandLineTool.html#CommandInputParameter)
100100
> - `format`
101101
> - `secondaryFiles`
102-
> - From [`inputBinding`](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineBinding)
102+
> - From [`inputBinding`](https://www.commonwl.org/v1.0/CommandLineTool.html#CommandLineBinding)
103103
> - `valueFrom`
104-
> - From [CommandOutputParamater](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter)
104+
> - From [CommandOutputParamater](https://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputParameter)
105105
> - `format`
106106
> - `secondaryFiles`
107-
> - From [CommandOutputBinding](http://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding)
107+
> - From [CommandOutputBinding](https://www.commonwl.org/v1.0/CommandLineTool.html#CommandOutputBinding)
108108
> - `glob`
109109
> - `outputEval`
110110
> - From `Workflow`
111-
> - From [InputParameter](http://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [WorkflowOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter)
111+
> - From [InputParameter](https://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [WorkflowOutputParameter](https://www.commonwl.org/v1.0/Workflow.html#WorkflowOutputParameter)
112112
> - `format`
113113
> - `secondaryFiles`
114114
> - From `steps`
115-
> - From [WorkflowStepInput](http://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput)
115+
> - From [WorkflowStepInput](https://www.commonwl.org/v1.0/Workflow.html#WorkflowStepInput)
116116
> - `valueFrom`
117117
> - From [ExpressionTool](https://www.commonwl.org/v1.0/Workflow.html#ExpressionTool)
118118
> - `expression`
119-
> - From [InputParameter](http://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [ExpressionToolOutputParameter](http://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)
119+
> - From [InputParameter](https://www.commonwl.org/v1.0/Workflow.html#InputParameter) and [ExpressionToolOutputParameter](https://www.commonwl.org/v1.0/Workflow.html#ExpressionToolOutputParameter)
120120
> - `format`
121121
> - `secondaryFiles`
122-
> - From [`ResourceRequirement`](http://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement)
122+
> - From [`ResourceRequirement`](https://www.commonwl.org/v1.0/CommandLineTool.html#ResourceRequirement)
123123
> - `coresMin`
124124
> - `coresMax`
125125
> - `ramMin`
@@ -128,17 +128,17 @@ syntax is used to describe the additional command line arguments.
128128
> - `tmpdirMax`
129129
> - `outdirMin`
130130
> - `outdirMax`
131-
> - From [`InitialWorkDirRequirement`](http://www.commonwl.org/v1.0/CommandLineTool.html#InitialWorkDirRequirement)
131+
> - From [`InitialWorkDirRequirement`](https://www.commonwl.org/v1.0/CommandLineTool.html#InitialWorkDirRequirement)
132132
> - `listing`
133-
> - in [Dirent](http://www.commonwl.org/v1.0/CommandLineTool.html#Dirent)
133+
> - in [Dirent](https://www.commonwl.org/v1.0/CommandLineTool.html#Dirent)
134134
> - `entry`
135135
> - `entryname`
136136
> - From `EnvVarRequirement`
137-
> - From [EnvironmentDef](http://www.commonwl.org/v1.0/CommandLineTool.html#EnvironmentDef)
137+
> - From [EnvironmentDef](https://www.commonwl.org/v1.0/CommandLineTool.html#EnvironmentDef)
138138
> - `envValue`
139139
{: .callout }
140140

141141

142-
[file-prop]: http://www.commonwl.org/v1.0/CommandLineTool.html#File
143-
[rec-practices]: http://www.commonwl.org/user_guide/rec-practices/
142+
[file-prop]: https://www.commonwl.org/v1.0/CommandLineTool.html#File
143+
[rec-practices]: https://www.commonwl.org/user_guide/rec-practices/
144144
{% include links.md %}

_episodes/16-file-formats.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,5 @@ Final process status is success
8888
{: .output}
8989

9090
[IANA]: https://www.iana.org/assignments/media-types/media-types.xhtml
91-
[EDAM]: http://www.ebi.ac.uk/ols/ontologies/edam/terms?iri=http%3A%2F%2Fedamontology.org%2Fformat_1915
91+
[EDAM]: https://www.ebi.ac.uk/ols/ontologies/edam/terms?iri=http%3A%2F%2Fedamontology.org%2Fformat_1915
9292
{% include links.md %}

_episodes/17-metadata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ requirements in order to use the tool, and a few more metadata fields.
4444
~~~
4545
{: .source}
4646

47-
[schema-salad]: http://www.commonwl.org/v1.0/SchemaSalad.html#Explicit_context
47+
[schema-salad]: https://www.commonwl.org/v1.0/SchemaSalad.html#Explicit_context
4848
{% include links.md %}

_extras/recommended-practices.md

Lines changed: 63 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,91 @@ title: "Recommended Practices"
44
permalink: /rec-practices/
55
---
66

7-
Below are a set of recommended good practices to keep in mind when writing a Common Workflow Language description for a tool or workflow. These guidelines are presented for consideration on a scale of usefulness: more is better, not all are required.
8-
9-
&#9744; No `type: string` parameters for names of input or reference files/directories; use `type: File` or `type: Directory` as appropriate.
10-
11-
&#9744; Include a license that allows for re-use by anyone, e.g. [Apache 2.0][apache-license]. If possible, the license should be specified with its corresponding [SPDX identifier][spdx]. Construct the metadata field for the licence by providing a URL of the form `https://spdx.org/licenses/[SPDX-ID]` where `SPDX-ID` is the taken from the list of identifiers linked above. See the example snippet below for guidance. For non-standard licenses without an SPDX identifier, provide a URL to the license.
7+
Below are a set of recommended good practices to keep in mind when writing a
8+
Common Workflow Language description for a tool or workflow. These guidelines
9+
are presented for consideration on a scale of usefulness: more is better, not
10+
all are required.
11+
12+
&#9744; No `type: string` parameters for names of input or reference
13+
files/directories; use `type: File` or `type: Directory` as appropriate.
14+
15+
&#9744; Include a license that allows for re-use by anyone, e.g.
16+
[Apache 2.0][apache-license]. If possible, the license should be specified with
17+
its corresponding [SPDX identifier][spdx]. Construct the metadata field for the
18+
licence by providing a URL of the form `https://spdx.org/licenses/[SPDX-ID]`
19+
where `SPDX-ID` is the taken from the list of identifiers linked above. See the
20+
example snippet below for guidance. For non-standard licenses without an SPDX
21+
identifier, provide a URL to the license.
1222

1323
_Example of metadata field for license with SPDX identifier:_
1424
~~~
1525
$namespaces:
16-
s: http://schema.org/
26+
s: https://schema.org/
1727
s:license: https://spdx.org/licenses/Apache-2.0
1828
# other s: declarations
1929
~~~
2030
{: .source}
2131

22-
For more examples of providing metadata within CWL descriptions, see the [Metadata and Authorship section][metadata-lesson] of this User Guide.
32+
For more examples of providing metadata within CWL descriptions, see the
33+
[Metadata and Authorship section]({{ page.root }}{% link _episodes/17-metadata.md %})
34+
of this User Guide.
2335

24-
&#9744; Include [attribution information][license-example] for the author(s) of the CWL tool or workflow description. Use unambiguous identifiers like [ORCID][orcid].
36+
&#9744; Include [attribution information][license-example] for the author(s) of
37+
the CWL tool or workflow description. Use unambiguous identifiers like
38+
[ORCID][orcid].
2539

26-
&#9744; In tool descriptions, list dependencies using short name(s) under `SoftwareRequirement`.
40+
&#9744; In tool descriptions, list dependencies using short name(s) under
41+
`SoftwareRequirement`.
2742

28-
&#9744; Include [SciCrunch][scicrunch-issue] identifiers for dependencies in `https://identifiers.org/rrid/RRID:SCR_NNNNNN` format.
43+
&#9744; Include [SciCrunch][scicrunch-issue] identifiers for dependencies in
44+
`https://identifiers.org/rrid/RRID:SCR_NNNNNN` format.
2945

30-
&#9744; All `input` and `output` identifiers should reflect their conceptual identity. Use informative names like `unaligned_sequences`, `reference_genome`, `phylogeny`, or `aligned_sequences` instead of `foo_input`, `foo_file`, `result`, `input`, `output`, and so forth.
46+
&#9744; All `input` and `output` identifiers should reflect their conceptual
47+
identity. Use informative names like `unaligned_sequences`, `reference_genome`,
48+
`phylogeny`, or `aligned_sequences` instead of `foo_input`, `foo_file`,
49+
`result`, `input`, `output`, and so forth.
3150

32-
&#9744; In tool descriptions, include a list of version(s) of the tool that are known to work with this description under `SoftwareRequirement`.
51+
&#9744; In tool descriptions, include a list of version(s) of the tool that are
52+
known to work with this description under `SoftwareRequirement`.
3353

34-
&#9744; `format` should be specified for all input and output `File`s. Bioinformatics tools should use format identifiers from [EDAM][edam-example]. See also `iana:text/plain`, `iana:text/tab-separated-values` with `$namespaces: { iana: "https://www.iana.org/assignments/media-types/" }`. [Full IANA media type list][iana-types] (also known as MIME types). For non-bioinformatics tools use or build an appropriate ontology/controlled vocabulary in the same way. Please edit this page to let us know about it.
54+
&#9744; `format` should be specified for all input and output `File`s.
55+
Bioinformatics tools should use format identifiers from [EDAM][edam-example].
56+
See also `iana:text/plain`, `iana:text/tab-separated-values` with
57+
`$namespaces: { iana: "https://www.iana.org/assignments/media-types/" }`.
58+
[Full IANA media type list][iana-types] (also known as MIME types). For
59+
non-bioinformatics tools use or build an appropriate ontology/controlled
60+
vocabulary in the same way. Please edit this page to let us know about it.
3561

36-
&#9744; Mark all input and output `File`s that are read from or written to in a streaming compatible way (only once, no random-access), as `streamable: true`.
62+
&#9744; Mark all input and output `File`s that are read from or written to in a
63+
streaming compatible way (only once, no random-access), as `streamable: true`.
3764

38-
&#9744; Each `CommandLineTool` description should focus on a single operation only, even if the (sub)command is capable of more. Don't overcomplicate your tool descriptions with options that you don't need/use.
65+
&#9744; Each `CommandLineTool` description should focus on a single operation
66+
only, even if the (sub)command is capable of more. Don't overcomplicate your
67+
tool descriptions with options that you don't need/use.
3968

40-
&#9744; Custom types should be defined with one external YAML per type definition for re-use.
69+
&#9744; Custom types should be defined with one external YAML per type
70+
definition for re-use.
4171

4272
&#9744; Include a top level short `label` summarising the tool/workflow.
4373

44-
&#9744; If useful, include a top level `doc` as well. This should provide a longer, more detailed description than was provided in the top level `label` (see above).
74+
&#9744; If useful, include a top level `doc` as well. This should provide a
75+
longer, more detailed description than was provided in the top level `label`
76+
(see above).
4577

46-
&#9744; Use `type: enum` instead of `type: string` for elements with a fixed list of valid values.
78+
&#9744; Use `type: enum` instead of `type: string` for elements with a fixed
79+
list of valid values.
4780

48-
&#9744; Evaluate all use of JavaScript for possible elimination or replacement. One common example: manipulating `File` names and paths? Consider whether one of the [built in `File` properties][file-prop] like `basename`, `nameroot`, `nameext`, etc, could be used instead.
81+
&#9744; Evaluate all use of JavaScript for possible elimination or replacement.
82+
One common example: manipulating `File` names and paths? Consider whether one
83+
of the [built in `File` properties][file-prop] like `basename`, `nameroot`,
84+
`nameext`, etc, could be used instead.
4985

50-
&#9744; Give the tool description to a colleague (preferably at a different institution) to test and provide feedback.
86+
&#9744; Give the tool description to a colleague (preferably at a different
87+
institution) to test and provide feedback.
5188

52-
&#9744; Complex workflows with individual components which can be abstracted should utilise the [`SubworkflowFeatureRequirement`][subworkflow] to make their workflow modular and allow sections of them to be easily reused.
89+
&#9744; Complex workflows with individual components which can be abstracted
90+
should utilise the [`SubworkflowFeatureRequirement`][subworkflow] to make their
91+
workflow modular and allow sections of them to be easily reused.
5392

5493
&#9744; Software containers should be made to be conformant to the ["Recommendations for the packaging and containerizing of bioinformatics software"][containers] (also useful to other disciplines).
5594

@@ -58,9 +97,8 @@ For more examples of providing metadata within CWL descriptions, see the [Metada
5897
[license-example]: https://github.com/ProteinsWebTeam/ebi-metagenomics-cwl/blob/master/workflows/emg-assembly.cwl#L200
5998
[scicrunch-issue]: https://github.com/common-workflow-language/common-workflow-language/issues/scicrunch.org
6099
[edam-example]: http://edamontology.org/format_1915
61-
[iana-types]: http://www.iana.org/assignments/media-types/media-types.xhtml
62-
[file-prop]: http://www.commonwl.org/v1.0/CommandLineTool.html#File
100+
[iana-types]: https://www.iana.org/assignments/media-types/media-types.xhtml
101+
[file-prop]: https://www.commonwl.org/v1.0/CommandLineTool.html#File
63102
[orcid]: https://orcid.org
64-
[subworkflow]: http://www.commonwl.org/v1.0/Workflow.html#SubworkflowFeatureRequirement
65-
[metadata-lesson]: /user_guide/17-metadata/
103+
[subworkflow]: https://www.commonwl.org/v1.0/Workflow.html#SubworkflowFeatureRequirement
66104
[spdx]: https://spdx.org/licenses/

_includes/cwl/19-custom-types/custom-types.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ outputs:
5454

5555
$namespaces:
5656
edam: http://edamontology.org/
57-
s: http://schema.org/
57+
s: https://schema.org/
5858

5959
$schemas:
6060
- http://edamontology.org/EDAM_1.16.owl

_includes/cwl/20-software-requirements/custom-types.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ outputs:
5959

6060
$namespaces:
6161
iana: https://www.iana.org/assignments/media-types/
62-
s: http://schema.org/
62+
s: https://schema.org/
6363
$schemas:
6464
- https://schema.org/docs/schema_org_rdfa.html
6565

_includes/links.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[importer]: https://github.com/new/import
1515
[jekyll-collection]: https://jekyllrb.com/docs/collections/
1616
[jekyll-install]: https://jekyllrb.com/docs/installation/
17-
[jekyll-windows]: http://jekyll-windows.juthilo.com/
17+
[jekyll-windows]: https://jekyll-windows.juthilo.com/
1818
[jekyll]: https://jekyllrb.com/
1919
[jupyter]: https://jupyter.org/
2020
[lesson-example]: https://swcarpentry.github.io/lesson-example/
@@ -34,4 +34,4 @@
3434
[styles]: https://github.com/swcarpentry/styles/
3535
[swc-releases]: https://github.com/swcarpentry/swc-releases
3636
[workshop-repo]: {{ site.workshop_repo }}
37-
[yaml]: http://yaml.org/
37+
[yaml]: https://yaml.org/

0 commit comments

Comments
 (0)