replace more imports

ResearchObject · Jul 28, 2023 · 61359bf · 61359bf
1 parent 31ea3ec
commit 61359bf
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/rocrate/metadata.py b/rocrate/metadata.py
@@ -19,7 +19,7 @@
 import json
 import warnings
 
-from .model.metadata import Metadata, LegacyMetadata
+from .model import Metadata, LegacyMetadata
 
 
 def read_metadata(metadata_path):

diff --git a/test/test_cli.py b/test/test_cli.py
@@ -22,7 +22,7 @@
 import pytest
 
 from rocrate.cli import cli
-from rocrate.model.file import File
+from rocrate.model import File
 from rocrate.model.metadata import TESTING_EXTRA_TERMS
 from rocrate.rocrate import ROCrate
 

diff --git a/test/test_model.py b/test/test_model.py
@@ -26,13 +26,15 @@
 
 import pytest
 from rocrate.rocrate import ROCrate
-from rocrate.model.data_entity import DataEntity
-from rocrate.model.file import File
-from rocrate.model.dataset import Dataset
-from rocrate.model.computationalworkflow import ComputationalWorkflow
-from rocrate.model.person import Person
-from rocrate.model.preview import Preview
-from rocrate.model.contextentity import ContextEntity
+from rocrate.model import (
+    DataEntity,
+    File,
+    Dataset,
+    ComputationalWorkflow,
+    Person,
+    Preview,
+    ContextEntity
+)
 
 
 RAW_REPO_URL = "https://raw.githubusercontent.com/ResearchObject/ro-crate-py"

diff --git a/test/test_read.py b/test/test_read.py
@@ -24,9 +24,7 @@
 from pathlib import Path
 
 from rocrate.rocrate import ROCrate
-from rocrate.model.data_entity import DataEntity
-from rocrate.model.file import File
-from rocrate.model.dataset import Dataset
+from rocrate.model import DataEntity, File, Dataset
 
 _URL = ('https://raw.githubusercontent.com/ResearchObject/ro-crate-py/master/'
         'test/test-data/sample_file.txt')

diff --git a/test/test_test_metadata.py b/test/test_test_metadata.py
@@ -19,12 +19,14 @@
 import pytest
 
 from rocrate.rocrate import ROCrate
-from rocrate.model.testservice import TestService
-from rocrate.model.testinstance import TestInstance
-from rocrate.model.testdefinition import TestDefinition
-from rocrate.model.testsuite import TestSuite
-from rocrate.model.softwareapplication import SoftwareApplication
-from rocrate.model.computationalworkflow import ComputationalWorkflow
+from rocrate.model import (
+    TestService,
+    TestInstance,
+    TestDefinition,
+    TestSuite,
+    SoftwareApplication,
+    ComputationalWorkflow,
+)
 
 # Tell pytest these are not test classes (so it doesn't try to collect them)
 TestService.__test__ = False

diff --git a/test/test_write.py b/test/test_write.py
@@ -24,8 +24,7 @@
 from itertools import product
 from urllib.error import URLError
 
-from rocrate.model.dataset import Dataset
-from rocrate.model.person import Person
+from rocrate.model import Dataset, Person
 from rocrate.rocrate import ROCrate