fixing import paths so tests can run again. refs #21, #14376

eclipse-sumo · Feb 21, 2024 · d0a5d50 · d0a5d50
1 parent 56a70b1
commit d0a5d50
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 633 deletions.
diff --git a/tests/tools/route/extractRouteEdges/errors.tools b/tests/tools/route/extractRouteEdges/errors.tools
diff --git a/tests/tools/route/extractRouteEdges/net.net.xml b/tests/tools/route/extractRouteEdges/net.net.xml
diff --git a/tests/tools/route/extractRouteEdges/options.tools b/tests/tools/route/extractRouteEdges/options.tools
diff --git a/tests/tools/route/extractRouteEdges/output.tools b/tests/tools/route/extractRouteEdges/output.tools
diff --git a/tests/tools/route/extractRouteEdges/routes.rou.xml b/tests/tools/route/extractRouteEdges/routes.rou.xml
diff --git a/tests/tools/route/extractRouteEdges/selection.tools b/tests/tools/route/extractRouteEdges/selection.tools
diff --git a/tools/sumolib/net/generator/corridor.py b/tools/sumolib/net/generator/corridor.py
@@ -18,12 +18,7 @@
 from __future__ import absolute_import
 import os
 import sys
-sys.path.append(
-    os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', 'tools'))
-sys.path.append(os.path.join(os.environ.get("SUMO_HOME", os.path.join(
-    os.path.dirname(__file__), '..', '..', '..', '..')), 'tools'))
-
-from . import network  # noqa
+import network  # noqa
 
 
 def corridor(numIntersections=10, defaultNode=None, defaultEdge=None, centralReservation=0, hdistance=500):

diff --git a/tools/sumolib/net/generator/cross.py b/tools/sumolib/net/generator/cross.py
@@ -16,7 +16,7 @@
 # @date    2013-10-10
 
 from __future__ import absolute_import
-from . import network  # noqa
+import network  # noqa
 
 
 def cross(defaultNode=None, defaultEdge=None, centralReservation=0):

diff --git a/tools/sumolib/net/generator/grid.py b/tools/sumolib/net/generator/grid.py
@@ -18,12 +18,8 @@
 from __future__ import absolute_import
 import os
 import sys
-sys.path.append(
-    os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', 'tools'))
-sys.path.append(os.path.join(os.environ.get("SUMO_HOME", os.path.join(
-    os.path.dirname(__file__), '..', '..', '..', '..')), 'tools'))
 
-from . import network  # noqa
+import network  # noqa
 
 
 def grid(numIntersectionsX=10, numIntersectionsY=5, defaultNode=None, defaultEdge=None, centralReservation=0):

diff --git a/tools/sumolib/net/generator/network.py b/tools/sumolib/net/generator/network.py
@@ -16,11 +16,16 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
-import sumolib
 import os
+import sys
 import subprocess
 import tempfile
 
+if 'SUMO_HOME' in os.environ:
+    tools = os.path.join(os.environ['SUMO_HOME'], 'tools')
+    sys.path.append(os.path.join(tools))
+import sumolib  # noqa
+
 
 class Node:
 

diff --git a/tools/sumolib/net/generator/straight.py b/tools/sumolib/net/generator/straight.py
@@ -18,12 +18,8 @@
 from __future__ import absolute_import
 import os
 import sys
-sys.path.append(
-    os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', 'tools'))
-sys.path.append(os.path.join(os.environ.get("SUMO_HOME", os.path.join(
-    os.path.dirname(__file__), '..', '..', '..', '..')), 'tools'))
 
-from . import network  # noqa
+import network  # noqa
 
 
 def straight(defaultNode=None, defaultEdge=None, centralReservation=0):