diff --git a/.gitignore b/.gitignore index f2efefa5..4cb818c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ **/*.pyc **/*checkpoint.py info.log -pyiron.log -scratch.ipynb \ No newline at end of file +pyiron.log \ No newline at end of file diff --git a/ryven/ironflow/Gui.py b/ryven/ironflow/Gui.py index d929836b..d03c795b 100644 --- a/ryven/ironflow/Gui.py +++ b/ryven/ironflow/Gui.py @@ -9,6 +9,7 @@ from .CanvasObject import CanvasObject, gui_modes import ryven.NENV as NENV +from pathlib import Path __author__ = "Joerg Neugebauer" __copyright__ = ( @@ -24,8 +25,8 @@ os.environ["RYVEN_MODE"] = "no-gui" NENV.init_node_env() -PACKAGES = ["ryven/std", "ryven/nodes/built_in/"] # , 'ryven/mynodes'] - +ryven_location = Path(__file__).parents[1] +packages = [os.path.join(ryven_location, *subloc) for subloc in [("std",), ("nodes", "built_in")]] # , ("mynodes",) alg_modes = ["data", "exec"] @@ -33,9 +34,8 @@ class GUI: - def __init__(self, packages=None): # , onto_dic=onto_dic): + def __init__(self): # , onto_dic=onto_dic): session = rc.Session() - packages = packages if packages is not None else PACKAGES for package in packages: session.register_nodes( import_nodes_package(NodesPackage(directory=package)) diff --git a/tests/unit/test_CanvasObject.py b/tests/unit/test_CanvasObject.py index 688dd6d6..729b8a48 100644 --- a/tests/unit/test_CanvasObject.py +++ b/tests/unit/test_CanvasObject.py @@ -10,7 +10,7 @@ class TestCanvasObect(TestCase): def setUp(self): - self.gui = GUI(packages=["../../ryven/std", "../../ryven/nodes/built_in/"]) + self.gui = GUI() self.canvas = self.gui.canvas_widget @classmethod