From 8270c45d678b575d883d6aa6833fd1d1cdd86285 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Thu, 14 Nov 2019 14:04:53 -0500 Subject: [PATCH 1/7] add installation docs --- docs/source/index.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/source/index.rst b/docs/source/index.rst index 90054666..60006127 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -66,6 +66,14 @@ flow of data. Typically people rely on tools like ``itertools.tee``, and However this quickly become cumbersome, especially when building complex pipelines. +Installation +------------ + +To install either use: + +- conda-forge: ``conda install streamz -c conda-forge`` +- pip: ``python -m pip install streazm`` +- local pip: ``git clone git@github.com:python-streamz/streamz.git; python -m pip install -e streamz`` Related Work ------------ From 97189eae49f3723e0548d9516df49c89b7763b8a Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Thu, 14 Nov 2019 14:25:23 -0500 Subject: [PATCH 2/7] fix typo --- docs/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 60006127..afe14728 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -72,7 +72,7 @@ Installation To install either use: - conda-forge: ``conda install streamz -c conda-forge`` -- pip: ``python -m pip install streazm`` +- pip: ``python -m pip install streamz`` - local pip: ``git clone git@github.com:python-streamz/streamz.git; python -m pip install -e streamz`` Related Work From 8468e2657ece2478abf67e0f79730fc15b28896f Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Thu, 14 Nov 2019 14:30:37 -0500 Subject: [PATCH 3/7] dev install --- docs/source/index.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index afe14728..597af131 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -72,8 +72,9 @@ Installation To install either use: - conda-forge: ``conda install streamz -c conda-forge`` -- pip: ``python -m pip install streamz`` -- local pip: ``git clone git@github.com:python-streamz/streamz.git; python -m pip install -e streamz`` +- pip: ``pip install streamz`` +- dev: git clone https://github.com/python-streamz/streamz + pip install -e streamz/ Related Work ------------ From dee3128d7e4f2a2fe3df536151b71049929cf657 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Thu, 14 Nov 2019 14:31:41 -0500 Subject: [PATCH 4/7] rst --- docs/source/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 597af131..c028010f 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -73,8 +73,8 @@ To install either use: - conda-forge: ``conda install streamz -c conda-forge`` - pip: ``pip install streamz`` -- dev: git clone https://github.com/python-streamz/streamz - pip install -e streamz/ +- dev: ``git clone https://github.com/python-streamz/streamz`` + ``pip install -e streamz/`` Related Work ------------ From 8126ff08df963709323a99f31549b3bf923cac26 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Thu, 14 Nov 2019 14:52:05 -0500 Subject: [PATCH 5/7] rst (again) --- docs/source/index.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index c028010f..3e877bce 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -73,8 +73,7 @@ To install either use: - conda-forge: ``conda install streamz -c conda-forge`` - pip: ``pip install streamz`` -- dev: ``git clone https://github.com/python-streamz/streamz`` - ``pip install -e streamz/`` +- dev: ``git clone https://github.com/python-streamz/streamz`` followed by ``pip install -e streamz/`` Related Work ------------ From f7603f4cbea54f1548885881206a3ca9d6e52250 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Thu, 14 Nov 2019 15:26:07 -0500 Subject: [PATCH 6/7] fix networkx breakage --- streamz/graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streamz/graph.py b/streamz/graph.py index ac9ec604..076811aa 100644 --- a/streamz/graph.py +++ b/streamz/graph.py @@ -114,7 +114,7 @@ def readable_graph(graph): """ import networkx as nx - mapping = {k: "{}".format(graph.node[k]["label"]) for k in graph} + mapping = {k: "{}".format(graph.nodes[k]["label"]) for k in graph} idx_mapping = {} for k, v in mapping.items(): if v in idx_mapping.keys(): From f8b7bdb6bcb9dd107677e82e755ff4695bf0c4be Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Fri, 15 Nov 2019 08:42:55 -0500 Subject: [PATCH 7/7] fix networkx error --- streamz/graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streamz/graph.py b/streamz/graph.py index 076811aa..f3170b3b 100644 --- a/streamz/graph.py +++ b/streamz/graph.py @@ -132,7 +132,7 @@ def to_graphviz(graph, **graph_attr): import graphviz gvz = graphviz.Digraph(graph_attr=graph_attr) - for node, attrs in graph.node.items(): + for node, attrs in graph.nodes.items(): gvz.node(node, **attrs) for edge, attrs in graph.edges().items(): gvz.edge(edge[0], edge[1], **attrs)