fixed test import errors

Author: tclose

pydra/design/tests/test_workflow.py

@@ -2,8 +2,7 @@
 from copy import copy
 import pytest
 import attrs
-from pydra.engine.workflow.base import Workflow
-from pydra.engine.workflow.lazy import LazyInField, LazyOutField
+from pydra.engine.lazy import LazyInField, LazyOutField
 import typing as ty
 from pydra.design import shell, python, workflow
 from pydra.engine.helpers import list_fields

pydra/engine/tests/test_environments.py

@@ -3,9 +3,7 @@
 from ..environments import Native, Docker, Singularity
 from ..task import ShellTask
 from ..submitter import Submitter
-from ..specs import (
-    File,
-)
+from fileformats.generic import File
 from pydra.design import shell
 from .utils import no_win, need_docker, need_singularity
 import pytest

pydra/engine/tests/test_helpers.py

@@ -15,7 +15,6 @@
     save,
     load_and_run,
     position_sort,
-    parse_copyfile,
     parse_format_string,
 )
 from pydra.utils.hash import hash_function

pydra/engine/tests/test_shelltask_inputspec.py

@@ -4,11 +4,8 @@
 import pytest
 
 from ..task import ShellTask
-from pydra.engine.specs import (
-    ShellOutputs,
-    ShellDef,
-    File,
-)
+from pydra.engine.specs import ShellOutputs, ShellDef
+from fileformats.generic import File
 from pydra.design import shell
 
 

pydra/engine/tests/test_singularity.py

@@ -5,7 +5,8 @@
 
 from ..task import ShellTask
 from ..submitter import Submitter
-from ..specs import ShellOutputs, File, ShellDef
+from ..specs import ShellOutputs, ShellDef
+from fileformats.generic import File
 from ..environments import Singularity
 
 

pydra/engine/tests/test_specs.py

@@ -5,14 +5,13 @@
 
 # from copy import deepcopy
 import time
-
+from fileformats.generic import File
 from ..specs import (
-    File,
     Runtime,
     Result,
     ShellDef,
 )
-from pydra.engine.workflow.lazy import (
+from pydra.engine.lazy import (
     LazyInField,
     LazyOutField,
 )