File tree Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Original file line number Diff line number Diff line change 3
3
import distutils .spawn # pylint: disable=no-name-in-module,import-error
4
4
import functools
5
5
import os
6
+ from typing import Text
6
7
7
8
import pytest
8
9
from pkg_resources import (Requirement , ResolutionError , # type: ignore
11
12
from cwltool .factory import Factory
12
13
from cwltool .utils import onWindows , windows_default_container_id
13
14
from cwltool .context import RuntimeContext , LoadingContext
15
+ from cwltool .resolver import Path
14
16
15
17
def get_windows_safe_factory (runtime_context = None , # type: RuntimeContext
16
18
loading_context = None , # type: LoadingContext
@@ -39,10 +41,7 @@ def get_data(filename):
39
41
pass
40
42
if not filepath or not os .path .isfile (filepath ):
41
43
filepath = os .path .join (os .path .dirname (__file__ ), os .pardir , filename )
42
- # warning, __file__ is all lowercase on Windows systems, this can
43
- # sometimes conflict with docker toolkit. Workaround: pip install .
44
- # and run the tests elsewhere via python -m pytest --pyarg cwltool
45
- return filepath
44
+ return Text (Path (filepath ).resolve ())
46
45
47
46
48
47
needs_docker = pytest .mark .skipif (not bool (distutils .spawn .find_executable ('docker' )),
You can’t perform that action at this time.
0 commit comments