explicit dep on importlib_resources

Author: mr-c

cwl_utils/parser/cwl_v1_0_utils.py

@@ -5,9 +5,9 @@
 from collections import namedtuple
 from io import StringIO
 from typing import (
+    IO,
     Any,
     Dict,
-    IO,
     List,
     MutableMapping,
     MutableSequence,

cwl_utils/parser/cwl_v1_1_utils.py

@@ -5,9 +5,9 @@
 from collections import namedtuple
 from io import StringIO
 from typing import (
+    IO,
     Any,
     Dict,
-    IO,
     List,
     MutableMapping,
     MutableSequence,

cwl_utils/parser/cwl_v1_2_utils.py

@@ -5,9 +5,9 @@
 from collections import namedtuple
 from io import StringIO
 from typing import (
+    IO,
     Any,
     Dict,
-    IO,
     List,
     MutableMapping,
     MutableSequence,

cwl_utils/parser/utils.py

@@ -13,6 +13,7 @@
 
 import cwl_utils
 import cwl_utils.parser
+
 from . import (
     LoadingOptions,
     Process,

cwl_utils/sandboxjs.py

@@ -8,6 +8,7 @@
 import re
 import select
 import subprocess  # nosec
+import sys
 import threading
 from abc import ABC, abstractmethod
 from io import BytesIO
@@ -25,7 +26,11 @@
     cast,
 )
 
-from importlib_resources import files
+if sys.version_info >= (3, 9):
+    from importlib.resources import files
+else:
+    from importlib_resources import files
+
 from schema_salad.utils import json_dumps
 
 from cwl_utils.errors import JavascriptException, WorkflowException

requirements.txt

@@ -4,3 +4,4 @@ rdflib
 requests
 schema-salad >= 8.5, < 9
 ruamel.yaml >= 0.17.6, < 0.19
+importlib_resources;python_version<'3.9'

tests/test_parser_utils.py

@@ -17,6 +17,7 @@
 import cwl_utils.parser.utils
 from cwl_utils.errors import WorkflowException
 from cwl_utils.parser import load_document_by_uri
+
 from .util import get_data