sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

graph-tool: update to new networkx API, be iterative 

Update the dot parser to the new networkx API (using pydotplus to parse).

Also, switch the path display to output the paths as they are found instead of
collecting them into a list, so output appears sooner.

(From OE-Core rev: c91898b07465fdd5f3629babb7ff9226454de24e)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2016-08-12 17:22:13 +01:00 committed by Richard Purdie
parent a1f39e5117
commit a56f14e5fc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/contrib/graph-tool
View File

@ -30,8 +30,7 @@ def get_path_networkx(dotfile, fromnode, tonode):
print('ERROR: Please install the networkx python module')
sys.exit(1)
graph = networkx.DiGraph(networkx.read_dot(dotfile))
graph = networkx.DiGraph(networkx.nx_pydot.read_dot(dotfile))
def node_missing(node):
import difflib
close_matches = difflib.get_close_matches(node, graph.nodes(), cutoff=0.7)
@ -53,11 +52,11 @@ def find_paths(args, usage):
fromnode = args[1]
tonode = args[2]
paths = list(get_path_networkx(args[0], fromnode, tonode))
if paths:
for path in paths:
print(" -> ".join(map(str,path)))
else:
path = None
for path in get_path_networkx(args[0], fromnode, tonode):
print(" -> ".join(map(str, path)))
if not path:
print("ERROR: no path from %s to %s in graph" % (fromnode, tonode))
sys.exit(1)