diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index d537b59a..346b8738 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -5,7 +5,7 @@ dependencies: - coverage - codacy-coverage - ipywidgets =8.1.1 -- pyiron_base =0.7.3 +- pyiron_base =0.7.5 - pyiron_atomistics =0.4.14 - maggma =0.60.2 - numpy =1.26.3 diff --git a/pyiron_gui/project/project_browser.py b/pyiron_gui/project/project_browser.py index b908061f..80d6a4ef 100644 --- a/pyiron_gui/project/project_browser.py +++ b/pyiron_gui/project/project_browser.py @@ -15,7 +15,7 @@ from pyiron_base import Project as BaseProject from pyiron_base import HasGroups -from pyiron_base import FileData +from pyiron_base.storage.filedata import FileData from pyiron_gui.widgets.widgets import WrapingHBox from pyiron_gui.wrapper.widgets import ObjectWidget, NumpyWidget from pyiron_gui.wrapper.wrapper import PyironWrapper, BaseWrapper diff --git a/setup.py b/setup.py index 869b0250..65b4b58a 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ keywords='pyiron', packages=find_packages(exclude=["*tests*", "*docs*", "*binder*", "*conda*", "*notebooks*", "*.ci_support*"]), install_requires=[ - 'pyiron_base==0.7.3', + 'pyiron_base==0.7.5', 'pyiron_atomistics==0.4.14', 'ipywidgets==8.1.1', 'matplotlib==3.8.2', diff --git a/tests/project/test_browser.py b/tests/project/test_browser.py index d38e4fb3..59c32dcf 100644 --- a/tests/project/test_browser.py +++ b/tests/project/test_browser.py @@ -56,8 +56,11 @@ def test_activate_gui(self): self.assertIsInstance(gui_pr, Project, msg="activate_gui should return a Project inherited from a pyiron_base Project.") for attribute in object.__dir__(self.project): - self.assertTrue(hasattr(gui_pr, attribute), - msg=f"GuiProject does not have the {attribute} attribute from the Project.") + try: + self.assertTrue(hasattr(gui_pr, attribute), + msg=f"GuiProject does not have the {attribute} attribute from the Project.") + except ImportError: # some attributes might have additional requirements like conda_environment + pass self.assertTrue(hasattr(gui_pr, 'browser'), msg="GuiProject does not have the added browser attribute.") self.assertIsInstance(gui_pr.browser, ProjectBrowser, msg='The browser attribute should return a ProjectBrowser')