fixing dependencies on ngraph

Author: networmix

dev/requirements.txt

@@ -1,7 +1,8 @@
-ngraph
+ngraph == 0.4.1
 pyyaml
 schema
 jq
+scipy
 pandas
 seaborn
 matplotlib

netsim/applications/packet_network/base.py

@@ -6,7 +6,7 @@
 import logging
 from typing import Callable, Dict, List, Optional, Set, Type, Union, Generator, Any
 
-from ngraph.graph import MultiDiGraph
+from ngraph.lib.graph import MultiDiGraph
 from schema import Schema
 
 from netsim.applications.packet_network.common import (

netsim/applications/packet_network/simulator.py

@@ -4,7 +4,7 @@
 from copy import deepcopy
 from typing import Any, Dict, Iterator, Optional, Type, Union
 
-from ngraph.graph import MultiDiGraph
+from ngraph.lib.graph import MultiDiGraph
 
 from netsim.des.common import SimTime, TimeInterval
 from netsim.des.core import (

requirements.txt

@@ -1,7 +1,8 @@
-ngraph
+ngraph == 0.4.1
 pyyaml
 schema
 jq
+scipy
 pandas
 seaborn
 matplotlib

tests/applications/packet_network/test_ee509.py

@@ -1,5 +1,5 @@
 # pylint: disable=protected-access,invalid-name
-from ngraph.graph import MultiDiGraph
+from ngraph.lib.graph import MultiDiGraph
 
 from netsim.des.core import SimTime
 from netsim.applications.packet_network.switch import PacketSwitch

tests/applications/packet_network/test_netsim.py

@@ -1,7 +1,7 @@
 # pylint: disable=protected-access,invalid-name
 import pprint
 
-from ngraph.graph import MultiDiGraph
+from ngraph.lib.graph import MultiDiGraph
 
 from netsim.des.core import SimTime
 from netsim.applications.packet_network.switch import PacketSwitch