Skip to content

Commit a6842dc

Browse files
kinowmr-c
authored andcommitted
Try a fix for podman docker
1 parent 3dc00b3 commit a6842dc

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.readthedocs.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ build:
66
os: ubuntu-22.04
77
tools:
88
python: "3.9"
9+
nodejs: "16"
910
apt_packages:
1011
- graphviz
11-
- nodejs
12-
- podman-docker
1312

1413
sphinx:
1514
configuration: src/conf.py
@@ -21,4 +20,3 @@ python:
2120
path: .
2221
extra_requirements:
2322
- all
24-

cwl/sphinx/runcmd.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ def run_command(command, working_directory):
6666
# For that reason, we define --disable-color in the CWLTOOL_OPTIONS
6767
# environment variable, which is used by ``cwltool``.
6868
env = os.environ
69-
env['CWLTOOL_OPTIONS'] = '--disable-color'
69+
cwl_options = set(env.get('CWLTOOL_OPTIONS', '').split(' '))
70+
cwl_options.add('--disable-color')
71+
env['CWLTOOL_OPTIONS'] = ' '.join(cwl_options)
7072
subp = subprocess.Popen(
7173
true_cmd,
7274
cwd=working_directory,

setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ test =
4949
cwltool==3.1.*
5050
watch =
5151
sphinx-autobuild==2021.3.*
52+
rtd =
53+
udocker
5254
all =
5355
%(test)s
5456
%(watch)s
57+
%(rtd)s

0 commit comments

Comments
 (0)