From 20dbbaed169a7cf12c52c3d76ac0c6aafec0f731 Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 31 May 2024 11:26:54 -0700 Subject: [PATCH 1/2] [patch] use ImportAlarm from pyiron_snippets --- .binder/environment.yml | 1 + .ci_support/environment.yml | 1 + docs/environment.yml | 1 + pyiron_contrib/generic/storage_interface_toolkit.py | 2 +- setup.py | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.binder/environment.yml b/.binder/environment.yml index 9afe8b12fc..782d967891 100644 --- a/.binder/environment.yml +++ b/.binder/environment.yml @@ -9,6 +9,7 @@ dependencies: - numpy =1.26.4 - pyiron_base =0.8.0 - pyiron_atomistics =0.5.4 +- pyiron_snippets =0.1.0 - pyparsing =3.1.2 - scipy =1.12.0 - seaborn =0.13.2 diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index 51d095ca50..066c42659d 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -9,6 +9,7 @@ dependencies: - numpy =1.26.4 - pyiron_base =0.8.0 - pyiron_atomistics =0.5.4 +- pyiron_snippets =0.1.0 - pyparsing =3.1.2 - scipy =1.12.0 - seaborn =0.13.2 diff --git a/docs/environment.yml b/docs/environment.yml index cbbb1d4d4d..046e73593f 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -14,6 +14,7 @@ dependencies: - numpy =1.26.4 - pyiron_base =0.8.0 - pyiron_atomistics =0.5.4 +- pyiron_snippets =0.1.0 - pyparsing =3.1.2 - scipy =1.12.0 - seaborn =0.13.2 diff --git a/pyiron_contrib/generic/storage_interface_toolkit.py b/pyiron_contrib/generic/storage_interface_toolkit.py index ef607247ef..dd86f49cb6 100644 --- a/pyiron_contrib/generic/storage_interface_toolkit.py +++ b/pyiron_contrib/generic/storage_interface_toolkit.py @@ -1,7 +1,7 @@ import warnings from pyiron_base import Toolkit -from pyiron_base import ImportAlarm +from pyiron_snippets.import_alarm import ImportAlarm try: from pyiron_contrib.generic.coscineIo import CoscineProject, CoscineResource diff --git a/setup.py b/setup.py index edce213517..b84f0b9322 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ 'matplotlib==3.8.3', 'numpy==1.26.4', 'pyiron_base==0.8', + 'pyiron_snippets==0.1.0', 'scipy==1.12.0', 'seaborn==0.13.2', 'pyparsing==3.1.2', From 9a58c7c377f1ee9a5f01ab41b52d07072f2a37bf Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 31 May 2024 11:54:42 -0700 Subject: [PATCH 2/2] [patch] use deprecate from pyiron_snippets --- pyiron_contrib/atomistics/randspg/randspg.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyiron_contrib/atomistics/randspg/randspg.py b/pyiron_contrib/atomistics/randspg/randspg.py index 5976923d1f..d112283252 100644 --- a/pyiron_contrib/atomistics/randspg/randspg.py +++ b/pyiron_contrib/atomistics/randspg/randspg.py @@ -11,7 +11,8 @@ from pyiron_atomistics.atomistics.structure.structurestorage import StructureStorage from pyiron_atomistics.atomistics.structure.atoms import Atoms from pyiron_atomistics.atomistics.structure.has_structure import HasStructure -from pyiron_base import GenericParameters, GenericJob, deprecate +from pyiron_base import GenericParameters, GenericJob +from pyiron_snippets.deprecate import deprecate from pyiron_atomistics.vasp.structure import read_atoms __author__ = "Jan Janssen"