Move get_data from tests to cwltool

Author: ThomasHickman

cwltool/utils.py

@@ -1,14 +1,17 @@
 from __future__ import absolute_import
 
-# no imports from cwltool allowed
-
 import os
 import shutil
 import stat
+from typing import Any, Callable, Dict, List, Text, Tuple, Union
+
 import six
-from six.moves import urllib
-from six.moves import zip_longest
-from typing import Any,Callable, Dict, List, Tuple, Text, Union
+from pkg_resources import (Requirement, ResolutionError,  # type: ignore
+                           resource_filename)
+
+from six.moves import urllib, zip_longest
+
+# no imports from cwltool allowed
 
 windows_default_container_id = "frolvlad/alpine-bash"
 
@@ -172,3 +175,17 @@ def bytes2str_in_dicts(a):
 
     # simply return elements itself
     return a
+
+def get_data(filename):
+    # type: (Text) -> Text
+    filename = os.path.normpath(
+        filename)  # normalizing path depending on OS or else it will cause problem when joining path
+    filepath = None
+    try:
+        filepath = resource_filename(
+            Requirement.parse("cwltool"), filename)
+    except ResolutionError:
+        pass
+    if not filepath or not os.path.isfile(filepath):
+        filepath = os.path.join(os.path.dirname(__file__), os.pardir, filename)
+    return filepath

tests/test_check.py

@@ -8,10 +8,7 @@
 import cwltool.workflow
 import pytest
 from cwltool.main import main
-from cwltool.utils import onWindows
-
-from .util import get_data
-
+from cwltool.utils import onWindows, get_data
 
 class TestCheck(unittest.TestCase):
     @pytest.mark.skipif(onWindows(),

tests/test_cwl_version.py

@@ -3,7 +3,7 @@
 
 from cwltool.main import main
 
-from .util import get_data
+from cwltool.utils import get_data
 
 class CWL_Version_Checks(unittest.TestCase):
     # no cwlVersion in the workflow

tests/test_default_path.py

@@ -1,6 +1,6 @@
 import unittest
 from cwltool.load_tool import fetch_document, validate_document
-from .util import get_data
+from cwltool.utils import get_data
 from schema_salad.ref_resolver import Loader
 
 class TestDefaultPath(unittest.TestCase):

tests/test_examples.py

@@ -8,7 +8,7 @@
 from io import StringIO
 
 from cwltool.errors import WorkflowException
-from cwltool.utils import onWindows
+from cwltool.utils import onWindows, get_data
 
 try:
     reload
@@ -26,7 +26,6 @@
 import schema_salad.validate
 from cwltool.main import main
 
-from .util import get_data
 
 sys.argv = ['']
 

tests/test_ext.py

@@ -10,8 +10,7 @@
 import cwltool.process
 import cwltool.workflow
 from cwltool.main import main
-from cwltool.utils import onWindows
-from .util import get_data
+from cwltool.utils import onWindows, get_data
 
 
 @pytest.mark.skipif(onWindows(),

tests/test_iwdr.py

@@ -2,7 +2,7 @@
 
 import cwltool
 import cwltool.factory
-from .util import get_data
+from cwltool.utils import get_data
 
 
 class TestInitialWorkDir(unittest.TestCase):

tests/test_js_sandbox.py

@@ -9,7 +9,7 @@
 # we should modify the subprocess imported from cwltool.sandboxjs
 from cwltool.sandboxjs import (check_js_threshold_version,
                                subprocess)
-from .util import get_data
+from cwltool.utils import get_data
 
 
 class Javascript_Sanity_Checks(unittest.TestCase):

tests/test_override.py

@@ -11,7 +11,7 @@
 from cwltool.utils import onWindows
 from six import StringIO
 
-from .util import get_data
+from cwltool.utils import get_data
 
 
 class TestOverride(unittest.TestCase):

tests/test_pack.py

@@ -17,8 +17,7 @@
 from cwltool.load_tool import fetch_document, validate_document
 from cwltool.main import makeRelative, main, print_pack
 from cwltool.pathmapper import adjustDirObjs, adjustFileObjs
-from cwltool.utils import onWindows
-from .util import get_data
+from cwltool.utils import onWindows, get_data
 
 
 class TestPack(unittest.TestCase):