Skip to content

Commit ff989df

Browse files
committed
Creating a preview of the outline proposed
1 parent c7240b9 commit ff989df

File tree

342 files changed

+1307
-1221
lines changed

Some content is hidden

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

342 files changed

+1307
-1221
lines changed

.github/workflows/gh-pages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
restore-keys: |
3535
${{ runner.os }}-pip-
3636
- name: Install dependencies
37-
run: python3 -m pip install -U -r ./requirements.txt
37+
run: python3 -m pip install -U -e .[all]
3838

3939
- name: Build documentation
4040
run: make html

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ _site
1111
.RData
1212

1313
_build/
14+
*.egg-info/

.readthedocs.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
3+
build:
4+
os: ubuntu-20.04
5+
tools:
6+
python: "3.9"
7+
8+
sphinx:
9+
configuration: src/conf.py
10+
builder: html
11+
12+
python:
13+
install:
14+
- method: pip
15+
path: .
16+
extra_requirements:
17+
- all
18+

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ branches:
1313
- main
1414
- /.*/
1515

16-
before_script:
16+
install:
1717
- pip install -U pip setuptools wheel typing
18-
- pip install cwltool cwltest html5lib
18+
- pip install -e .[all]
1919

2020
script:
2121
- make RUNNER=cwltool unittest-examples

AUTHORS renamed to AUTHORS.md

File renamed without changes.

CITATION renamed to CITATION.md

File renamed without changes.

Gemfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

Gemfile.lock

Lines changed: 0 additions & 70 deletions
This file was deleted.

Makefile

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,45 @@
33

44
# You can set these variables from the command line, and also
55
# from the environment for the first two.
6-
SPHINXOPTS = "-W"
7-
SPHINXBUILD = sphinx-build
8-
SOURCEDIR = .
9-
BUILDDIR = _build
6+
SPHINXOPTS = "-W"
7+
SPHINXBUILD = sphinx-build
8+
SOURCEDIR = src
9+
BUILDDIR = _build
10+
RUNNER = cwl-runner
1011

1112
# User-friendly check for sphinx-build
1213
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
13-
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
14+
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://sphinx-doc.org/)
1415
endif
1516

1617
# Put it first so that "make" without argument is like "make help".
1718
help:
1819
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
1920

20-
.PHONY: help Makefile
21+
clean:
22+
@$(SPHINXBUILD) -M clean "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
23+
# Add any other directories to be removed below this line.
2124

22-
watch:
25+
watch: clean
2326
@echo
2427
@echo "Building and watching for changes in the documentation."
25-
sphinx-autobuild --ignore venv . _build/html
28+
sphinx-autobuild "$(SOURCEDIR)" "$(BUILDDIR)" \
29+
--ignore='**venv' \
30+
--ignore='**.github' \
31+
--ignore='*.egg-info' \
32+
--watch='cwl'
2633

27-
## unittest : run unit tests on checking tools.
28-
unittest :
29-
@bin/test_lesson_check.py
34+
## unittest-examples :
35+
unittest-examples:
36+
cd src/_includes/cwl; cwltest --test=conformance-test.yml --tool=${RUNNER}
3037

31-
#-------------------------------------------------------------------------------
32-
# Include extra commands if available.
33-
#-------------------------------------------------------------------------------
38+
## check-json :
39+
check-json:
40+
python -m json.tool < src/.zenodo.json >> /dev/null && exit 0 || echo "NOT valid JSON"; exit 1
3441

35-
-include commands.mk
42+
.PHONY: help clean watch unittest-examples check-json Makefile
3643

37-
# Catch-all target: route all unknown targets to Sphinx using the new
44+
# Catch-all target : route all unknown targets to Sphinx using the new
3845
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
3946
%: Makefile
4047
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

README.md

Lines changed: 71 additions & 2 deletions
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=main)](https://travis-ci.org/common-workflow-language/user_guide)
44

5-
[User guide for CWL v1.0.2](https://www.commonwl.org/user_guide/)
5+
[User guide for CWL v1.2.0](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
@@ -15,8 +15,77 @@ To edit the user guide:
1515

1616
We'd like to ask you to familiarize yourself with our [Contribution Guide](CONTRIBUTING.md).
1717

18+
### Code examples
1819

19-
* FIXME
20+
To include code into a Markdown file you have two options. For external files use
21+
the following command:
22+
23+
````
24+
```{literalinclude} /_includes/cwl/hello_world.cwl
25+
:language: cwl
26+
```
27+
````
28+
29+
For code examples in the same page, you can use fence blocks.
30+
31+
````
32+
```bash
33+
echo "Hello world"
34+
```
35+
````
36+
37+
If you would like to customize the syntax highlighting styles
38+
you will have to customize the Sphinx and Pygments settings.
39+
To preview Pygments output with different styles, use their
40+
[Pygments demo tool](https://pygments.org/demo/).
41+
42+
### Links
43+
44+
Sphinx and the theme are configured to auto-generate anchor slug
45+
links for sections. So sections like ``## cwl standard`` are translated
46+
into an anchor link `#cwl-standard`.
47+
48+
If you are having trouble with links to sections or code blocks, it might
49+
be due to duplicated sections, or to spaces or other characters. To
50+
preview the generated links, use the `myst-anchors` tool.
51+
52+
```bash
53+
$ (venv) myst-anchors basic-concepts.md
54+
<h1 id="basic-concepts"></h1>
55+
<h2 id="the-cwl-standard"></h2>
56+
<h2 id="implementations"></h2>
57+
<h2 id="cwl-objects-model"></h2>
58+
```
59+
60+
You can also create reference anchor links anywhere on the page with
61+
``(test)=``, which can be used in the page as `#test` (these do not appear
62+
in the `myst-anchor` output).
63+
64+
## Extensions
65+
66+
We use MyST Parser with Sphinx. This gives us the best of both Sphinx and Markdown,
67+
while also supporting reStructuredText, Sphinx, and MyST extensions.
68+
69+
### String Substitutions
70+
71+
For convenience, we have the currently supported version of the specification as a
72+
constant in `conf.py`. We have it in two forms:
73+
74+
- Markdown preformatted, i.e. \`v0.0\` which is formatted as `v0.0`
75+
- Plain text, i.e. v0.0
76+
77+
Note that String Substitutions do not work with links. As workaround, you can use
78+
string formatting or replacements.
79+
80+
```
81+
The CWL {{ cwl_version }} Specification: {{ '<https://www.commonwl.org/{}/>'.format(cwl_version_text) }}
82+
```
83+
84+
For more:
85+
86+
- <https://myst-parser.readthedocs.io/en/latest/syntax/optional.html#substitutions-with-jinja2>
87+
- <https://myst-parser.readthedocs.io/en/latest/syntax/optional.html#substitutions-and-urls>
88+
- <https://github.com/executablebooks/MyST-Parser/issues/279>
2089

2190
## Authors
2291

_config.yml

Lines changed: 0 additions & 110 deletions
This file was deleted.

0 commit comments

Comments
 (0)