Skip to content

Commit

Permalink
Migrate sections to use runcmd where possible.
Browse files Browse the repository at this point in the history
Also fix a few typos found during review. Replace backticks code blocks by code-block directive. Update conformance tests. Ignore output.txt files.
  • Loading branch information
kinow committed Sep 8, 2022
1 parent 587c2ae commit 25b8896
Show file tree
Hide file tree
Showing 106 changed files with 396 additions and 900 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ _site

_build/
*.egg-info/

src/_includes/cwl/**/output.txt
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ watch: clean
--ignore='**venv' \
--ignore='**.github' \
--ignore='*.egg-info' \
--ignore='**_includes/**/*.txt' \
--watch='cwl'

## unittest-examples :
Expand Down
9 changes: 8 additions & 1 deletion cwl/sphinx/runcmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import subprocess
import sys

from pathlib import Path

from docutils.parsers.rst import directives
from sphinx.directives import code

Expand Down Expand Up @@ -116,7 +118,12 @@ def run(self):
# change to that working directory before running the desired command.
# The working directory is omitted from the final output.
# TODO: PATCHED
working_directory = self.options.get('working-directory', 'src/_includes/cwl/')
includes_dir = Path('src/_includes/cwl/')
if not includes_dir.exists():
# You can run Sphinx from the root directory, with `make watch`
# for instance, or from the src directory (RTD does that).
includes_dir = Path('_includes/cwl')
working_directory = self.options.get('working-directory', includes_dir)
if working_directory == '':
# subprocess default value, so that we can disable it if needed.
working_directory = None
Expand Down
11 changes: 0 additions & 11 deletions src/_includes/cwl/02-1st-example/1st-tool.cwl

This file was deleted.

1 change: 0 additions & 1 deletion src/_includes/cwl/14-runtime/echo-job.yml

This file was deleted.

26 changes: 0 additions & 26 deletions src/_includes/cwl/22-nested-workflows/1st-workflow.cwl

This file was deleted.

21 changes: 0 additions & 21 deletions src/_includes/cwl/22-nested-workflows/arguments.cwl

This file was deleted.

19 changes: 0 additions & 19 deletions src/_includes/cwl/22-nested-workflows/tar-param.cwl

This file was deleted.

Binary file not shown.
File renamed without changes.
Loading

0 comments on commit 25b8896

Please sign in to comment.