From 63224a9a8164c1e12c2a51a8d43eb69e89b40ad6 Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 9 Aug 2024 12:27:42 -0700 Subject: [PATCH 1/2] Remove unused import --- pyiron_workflow/mixin/storage.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyiron_workflow/mixin/storage.py b/pyiron_workflow/mixin/storage.py index 13ea7ddd8..8bb5c77ec 100644 --- a/pyiron_workflow/mixin/storage.py +++ b/pyiron_workflow/mixin/storage.py @@ -9,7 +9,6 @@ from importlib import import_module import os import pickle -import sys from typing import Optional import cloudpickle From a5ce7829d1d9ed8d3f8c94915638e9053f51b4a7 Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 9 Aug 2024 12:55:37 -0700 Subject: [PATCH 2/2] Never interact directly with the storage object Always go through HasStorage methods. In practice, this was only .delete. --- notebooks/deepdive.ipynb | 2 +- tests/unit/nodes/test_macro.py | 2 +- tests/unit/test_node.py | 2 +- tests/unit/test_workflow.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/notebooks/deepdive.ipynb b/notebooks/deepdive.ipynb index f25a5284b..80a02f138 100644 --- a/notebooks/deepdive.ipynb +++ b/notebooks/deepdive.ipynb @@ -5570,7 +5570,7 @@ "metadata": {}, "outputs": [], "source": [ - "reloaded.storage.delete()" + "reloaded.delete_storage()" ] }, { diff --git a/tests/unit/nodes/test_macro.py b/tests/unit/nodes/test_macro.py index 3bc216e0b..3ed31460d 100644 --- a/tests/unit/nodes/test_macro.py +++ b/tests/unit/nodes/test_macro.py @@ -532,7 +532,7 @@ def test_storage_for_modified_macros(self): f"Backend {backend} not recognized -- write a test for it" ) finally: - macro.storage.delete() + macro.delete_storage() def test_output_label_stripping(self): """Test extensions to the `ScrapesIO` mixin.""" diff --git a/tests/unit/test_node.py b/tests/unit/test_node.py index 2cf56f23b..b47b04cab 100644 --- a/tests/unit/test_node.py +++ b/tests/unit/test_node.py @@ -521,7 +521,7 @@ def test_save_after_run(self): "on instantiation" ) finally: - saves.storage.delete() # Clean up + saves.delete_storage() # Clean up if __name__ == '__main__': diff --git a/tests/unit/test_workflow.py b/tests/unit/test_workflow.py index 73e834565..fe7a4cce8 100644 --- a/tests/unit/test_workflow.py +++ b/tests/unit/test_workflow.py @@ -463,7 +463,7 @@ def test_storage_values(self): ) finally: # Clean up after ourselves - wf.storage.delete() + wf.delete_storage() def test_storage_scopes(self): wf = Workflow("wf") @@ -480,7 +480,7 @@ def test_storage_scopes(self): wf.save() Workflow(wf.label, storage_backend=backend) finally: - wf.storage.delete() + wf.delete_storage() with self.subTest("No unimportable nodes for either back-end"): for backend in Workflow.allowed_backends(): @@ -496,7 +496,7 @@ def test_storage_scopes(self): wf.save() finally: wf.remove_child(wf.import_type_mismatch) - wf.storage.delete() + wf.delete_storage() with self.subTest("Unimportable node"): @Workflow.wrap.as_function_node("y")