From d6c7dbc1c26260cba642439b0d0e9cc16ed7aba3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 05:17:47 +0000 Subject: [PATCH 1/4] Bump pyiron-base from 0.7.3 to 0.7.5 Bumps [pyiron-base](https://github.com/pyiron/pyiron_base) from 0.7.3 to 0.7.5. - [Release notes](https://github.com/pyiron/pyiron_base/releases) - [Changelog](https://github.com/pyiron/pyiron_base/blob/main/CHANGELOG.md) - [Commits](https://github.com/pyiron/pyiron_base/compare/pyiron_base-0.7.3...pyiron_base-0.7.5) --- updated-dependencies: - dependency-name: pyiron-base dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 869b025..65b4b58 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', From cf02d68958e7b7d79249a44d340e08540ceabd9c Mon Sep 17 00:00:00 2001 From: pyiron-runner Date: Tue, 13 Feb 2024 05:17:58 +0000 Subject: [PATCH 2/4] [dependabot skip] Update environment --- .ci_support/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index d537b59..346b873 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 From 3e94a69e8dc7be68fd0c3580d660c4b0a9c2a298 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Tue, 13 Feb 2024 06:34:10 +0100 Subject: [PATCH 3/4] Update project_browser.py --- pyiron_gui/project/project_browser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyiron_gui/project/project_browser.py b/pyiron_gui/project/project_browser.py index b908061..80d6a4e 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 From 04acd6d33ad40ea8ff731439e6d91d6626725780 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Tue, 13 Feb 2024 06:47:46 +0100 Subject: [PATCH 4/4] Update test_browser.py --- tests/project/test_browser.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/project/test_browser.py b/tests/project/test_browser.py index d38e4fb..59c32dc 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')