Package: cwltool / 1.0.20181217162649+dfsg-10

scandir Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
Author: Michael R. Crusoe <michael.crusoe@gmail.com>
Description: In Debian we have modern Python, don't use the external scandir
--- cwltool.orig/cwltool/process.py
+++ cwltool/cwltool/process.py
@@ -46,10 +46,7 @@
 from .utils import (DEFAULT_TMP_PREFIX, aslist, cmp_like_py2,
                     copytree_with_merge, onWindows, random_outdir)
 from .validate_js import validate_js_expressions
-try:
-    from os import scandir  # type: ignore
-except ImportError:
-    from scandir import scandir  # type: ignore
+from os import scandir  # type: ignore
 if TYPE_CHECKING:
     from .provenance import ProvenanceProfile  # pylint: disable=unused-import
 
--- cwltool.orig/requirements.txt
+++ cwltool/requirements.txt
@@ -9,6 +9,5 @@
 bagit==1.6.4
 mypy-extensions
 psutil
-scandir
 subprocess32 >= 3.5.0; os.name=="posix" and python_version<"3.5"
 typing-extensions
--- cwltool.orig/setup.py
+++ cwltool/setup.py
@@ -57,7 +57,6 @@
           'mypy-extensions',
           'six >= 1.9.0',  # >= 1.9.0 required by prov
           'psutil',
-          'scandir',
           'prov == 1.5.1',
           'bagit >= 1.6.4',
           'typing-extensions',