diff --git a/doc/requirements.txt b/doc/requirements.txt index 2e3e732cb9..9e641a0cf3 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -16,6 +16,7 @@ sadisplay>=0.4.8 # BSD reno>=2.5.0 # Apache-2.0 # This needs to be installed after above modules +pydot>=1.2.4 # MIT License pydotplus>=2.0.2 # MIT License pyparsing>=2.1.0 # MIT networkx>=1.10 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index 3c53d8afc6..7abbc275b8 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -27,10 +27,8 @@ sys.path.insert(0, os.path.abspath('.')) from tools import create_flow_docs # Generate our flow diagrams -# TODO(johnsom) Re-enable flow diagrams when networkx supports individual -# extras. See https://github.com/networkx/networkx/pull/3080 -# create_flow_docs.generate( -# 'tools/flow-list.txt', 'doc/source/contributor/devref/flow_diagrams') +create_flow_docs.generate( + 'tools/flow-list.txt', 'doc/source/contributor/devref/flow_diagrams') # Generate entity relationship diagram desc = sadisplay.describe( diff --git a/doc/source/contributor/devref/flows.rst b/doc/source/contributor/devref/flows.rst index 39803ad44f..04295f3dc3 100644 --- a/doc/source/contributor/devref/flows.rst +++ b/doc/source/contributor/devref/flows.rst @@ -8,18 +8,14 @@ controller needs to take while managing load balancers. This document is meant as a reference for the key flows used in the Octavia controller. -.. note:: Flow diagrams are temporarly disabled due to a dependency issue. - .. toctree:: :maxdepth: 1 -.. TODO(johnsom) Re-enable flow diagrams when networkx supports individual -.. extras. See https://github.com/networkx/networkx/pull/3080 -.. flow_diagrams/AmphoraFlows.rst -.. flow_diagrams/HealthMonitorFlows.rst -.. flow_diagrams/L7PolicyFlows.rst -.. flow_diagrams/L7RuleFlows.rst -.. flow_diagrams/ListenerFlows.rst -.. flow_diagrams/LoadBalancerFlows.rst -.. flow_diagrams/MemberFlows.rst -.. flow_diagrams/PoolFlows.rst + flow_diagrams/AmphoraFlows.rst + flow_diagrams/HealthMonitorFlows.rst + flow_diagrams/L7PolicyFlows.rst + flow_diagrams/L7RuleFlows.rst + flow_diagrams/ListenerFlows.rst + flow_diagrams/LoadBalancerFlows.rst + flow_diagrams/MemberFlows.rst + flow_diagrams/PoolFlows.rst diff --git a/lower-constraints.txt b/lower-constraints.txt index 4f1604454d..c13aa63e70 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -107,6 +107,7 @@ pyasn1-modules==0.0.6 pycadf==2.7.0 pycodestyle==2.3.1 pycparser==2.18 +pydot==1.2.4 pyflakes==1.0.0 Pygments==2.2.0 pyinotify==0.9.6