Skip to content

Commit 404cbf1

Browse files
committed
support Pydot versions before 3.0
1 parent 2291376 commit 404cbf1

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

cwltool/cwlviewer.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77

88
import pydot
99
import rdflib
10+
from packaging.version import Version
11+
12+
if Version(pydot.__version__) > Version("3.0"):
13+
quote_id_if_necessary = pydot.quote_id_if_necessary
14+
else:
15+
quote_id_if_necessary = pydot.quote_if_necessary
1016

1117

1218
def _get_inner_edges_query() -> str:
@@ -99,8 +105,8 @@ def _set_inner_edges(self) -> None:
99105
self._dot_graph.add_node(n)
100106
self._dot_graph.add_edge(
101107
pydot.Edge(
102-
pydot.quote_id_if_necessary(str(inner_edge_row["source_step"])),
103-
pydot.quote_id_if_necessary(str(inner_edge_row["target_step"])),
108+
quote_id_if_necessary(str(inner_edge_row["source_step"])),
109+
quote_id_if_necessary(str(inner_edge_row["target_step"])),
104110
)
105111
)
106112

@@ -130,8 +136,8 @@ def _set_input_edges(self) -> None:
130136
inputs_subgraph.add_node(n)
131137
self._dot_graph.add_edge(
132138
pydot.Edge(
133-
pydot.quote_id_if_necessary(str(input_row["input"])),
134-
pydot.quote_id_if_necessary(str(input_row["step"])),
139+
quote_id_if_necessary(str(input_row["input"])),
140+
quote_id_if_necessary(str(input_row["step"])),
135141
)
136142
)
137143

@@ -161,8 +167,8 @@ def _set_output_edges(self) -> None:
161167
outputs_graph.add_node(n)
162168
self._dot_graph.add_edge(
163169
pydot.Edge(
164-
pydot.quote_id_if_necessary(output_edge_row["step"]),
165-
pydot.quote_id_if_necessary(output_edge_row["output"]),
170+
quote_id_if_necessary(output_edge_row["step"]),
171+
quote_id_if_necessary(output_edge_row["output"]),
166172
)
167173
)
168174

0 commit comments

Comments
 (0)