Fix python 3 relative module import

MD-Studio · Dec 9, 2019 · 636d93f · 636d93f
1 parent 79a283d
commit 636d93f
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 14 deletions.
diff --git a/tests/module/module_branched_workflow_test.py b/tests/module/module_branched_workflow_test.py
@@ -16,7 +16,7 @@
 import time
 import unittest
 
-from unittest_baseclass import UnittestPythonCompatibility
+from tests.module.unittest_baseclass import UnittestPythonCompatibility
 from mdstudio_workflow import Workflow, WorkflowSpec
 
 currpath = os.path.dirname(__file__)

diff --git a/tests/module/module_linear_workflow_test.py b/tests/module/module_linear_workflow_test.py
@@ -13,7 +13,7 @@
 import time
 
 from mdstudio_workflow import Workflow, WorkflowSpec
-from unittest_baseclass import UnittestPythonCompatibility
+from tests.module.unittest_baseclass import UnittestPythonCompatibility
 
 currpath = os.path.dirname(__file__)
 workflow_file_path = os.path.abspath(os.path.join(currpath, '../files/test-linear-workflow.jgf'))

diff --git a/tests/module/module_mapper_test.py b/tests/module/module_mapper_test.py
@@ -14,16 +14,17 @@
 """
 
 import os
-import unittest
 import time
 
+from tests.module.unittest_baseclass import UnittestPythonCompatibility
+
 from mdstudio_workflow import Workflow, WorkflowSpec
 
 currpath = os.path.dirname(__file__)
 workflow_file_path = os.path.abspath(os.path.join(currpath, '../files/test-mapreduce-workflow.jgf'))
 
 
-class TestBuildMapperWorkflow(unittest.TestCase):
+class TestBuildMapperWorkflow(UnittestPythonCompatibility):
     """
     Build the map-reduce workflow a shown in the file header using the default
     threader PythonTask runner

diff --git a/tests/module/module_mapreduce_workflow_test.py b/tests/module/module_mapreduce_workflow_test.py
@@ -18,8 +18,10 @@
 """
 
 import os
-import unittest
 import time
+import unittest
+
+from tests.module.unittest_baseclass import UnittestPythonCompatibility
 
 from mdstudio_workflow import Workflow, WorkflowSpec
 
@@ -66,7 +68,7 @@ def test5_final_workflow_output(self):
         self.assertDictEqual(result, self.expected_output)
 
 
-class TestBuildMapreduceWorkflow(unittest.TestCase):
+class TestBuildMapreduceWorkflow(UnittestPythonCompatibility):
     """
     Build the map-reduce workflow a shown in the file header using the default
     threader PythonTask runner
@@ -127,7 +129,7 @@ def test4_save_workflow(self):
         self.assertTrue(os.path.exists(workflow_file_path))
 
 
-class TestRunMapreduceWorkflowDefault(BaseWorkflowRunnerTests, unittest.TestCase):
+class TestRunMapreduceWorkflowDefault(BaseWorkflowRunnerTests, UnittestPythonCompatibility):
     """
     Run the branched workflow build in TestBuildBranchedWorkflow
     """
@@ -174,7 +176,7 @@ def test3_run_workflow(self):
             time.sleep(1)
 
 
-class TestZcleanup(unittest.TestCase):
+class TestZcleanup(UnittestPythonCompatibility):
 
     @classmethod
     def setUpClass(cls):

diff --git a/tests/module/module_taskobject_test.py b/tests/module/module_taskobject_test.py
@@ -14,7 +14,7 @@
 
 from graphit.graph_io.io_jsonschema_format import read_json_schema
 from graphit.graph_exceptions import GraphitValidationError
-from unittest_baseclass import UnittestPythonCompatibility
+from tests.module.unittest_baseclass import UnittestPythonCompatibility
 
 from mdstudio_workflow.workflow_task_types import WORKFLOW_ORM
 

diff --git a/tests/module/module_tasktypes_test.py b/tests/module/module_tasktypes_test.py
@@ -16,8 +16,8 @@
 
 from mdstudio_workflow import WorkflowSpec
 
-from dummy_task_runners import task_runner
-from unittest_baseclass import UnittestPythonCompatibility, STRING_TYPES
+from tests.module.dummy_task_runners import task_runner
+from tests.module.unittest_baseclass import UnittestPythonCompatibility, STRING_TYPES
 
 currpath = os.path.dirname(__file__)
 

diff --git a/tests/module/module_workdir_test.py b/tests/module/module_workdir_test.py
@@ -11,7 +11,7 @@
 import shutil
 
 from mdstudio_workflow import Workflow
-from unittest_baseclass import UnittestPythonCompatibility
+from tests.module.unittest_baseclass import UnittestPythonCompatibility
 
 currpath = os.path.dirname(__file__)
 tmp_project_dir = os.path.abspath(os.path.join(currpath, '../files/test_project'))

diff --git a/tests/module/module_workflow_semantics_test.py b/tests/module/module_workflow_semantics_test.py
@@ -12,7 +12,7 @@
 from mdstudio_workflow import Workflow
 from mdstudio_workflow.workflow_task_types.task_base_type import edge_select_transform
 
-from unittest_baseclass import UnittestPythonCompatibility
+from tests.module.unittest_baseclass import UnittestPythonCompatibility
 
 currpath = os.path.dirname(__file__)
 

diff --git a/tests/module/module_workflowspec_test.py b/tests/module/module_workflowspec_test.py
@@ -11,7 +11,7 @@
 import jsonschema
 
 from graphit.graph_io.io_pydata_format import write_pydata
-from unittest_baseclass import UnittestPythonCompatibility
+from tests.module.unittest_baseclass import UnittestPythonCompatibility
 
 from mdstudio_workflow import WorkflowSpec
 from mdstudio_workflow.workflow_common import WorkflowError