Skip to content

Commit 25b8896

Browse files
committed
Migrate sections to use runcmd where possible.
Also fix a few typos found during review. Replace backticks code blocks by code-block directive. Update conformance tests. Ignore output.txt files.
1 parent 587c2ae commit 25b8896

File tree

106 files changed

+396
-900
lines changed

Some content is hidden

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

106 files changed

+396
-900
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ _site
1212

1313
_build/
1414
*.egg-info/
15+
16+
src/_includes/cwl/**/output.txt

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ watch: clean
2828
--ignore='**venv' \
2929
--ignore='**.github' \
3030
--ignore='*.egg-info' \
31+
--ignore='**_includes/**/*.txt' \
3132
--watch='cwl'
3233

3334
## unittest-examples :

cwl/sphinx/runcmd.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import subprocess
55
import sys
66

7+
from pathlib import Path
8+
79
from docutils.parsers.rst import directives
810
from sphinx.directives import code
911

@@ -116,7 +118,12 @@ def run(self):
116118
# change to that working directory before running the desired command.
117119
# The working directory is omitted from the final output.
118120
# TODO: PATCHED
119-
working_directory = self.options.get('working-directory', 'src/_includes/cwl/')
121+
includes_dir = Path('src/_includes/cwl/')
122+
if not includes_dir.exists():
123+
# You can run Sphinx from the root directory, with `make watch`
124+
# for instance, or from the src directory (RTD does that).
125+
includes_dir = Path('_includes/cwl')
126+
working_directory = self.options.get('working-directory', includes_dir)
120127
if working_directory == '':
121128
# subprocess default value, so that we can disable it if needed.
122129
working_directory = None

src/_includes/cwl/02-1st-example/1st-tool.cwl

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

src/_includes/cwl/14-runtime/echo-job.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/_includes/cwl/22-nested-workflows/1st-workflow.cwl

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

src/_includes/cwl/22-nested-workflows/arguments.cwl

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

src/_includes/cwl/22-nested-workflows/tar-param.cwl

Lines changed: 0 additions & 19 deletions
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)