Skip to content

Commit d6c9b1e

Browse files
authored
Version limit schema-salad < 2 until able to merge version that works… (#236)
* Version limit schema-salad < 2 until able to merge version that works with 2+ * Bump to fixed version of schema salad.
1 parent 909edbf commit d6c9b1e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

cwltool/job.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def __init__(self): # type: () -> None
117117

118118
def run(self, dry_run=False, pull_image=True, rm_container=True,
119119
rm_tmpdir=True, move_outputs="move", **kwargs):
120-
# type: (bool, bool, bool, bool, bool, Text, **Any) -> Union[Tuple[Text, Dict[None, None]], None]
120+
# type: (bool, bool, bool, bool, Text, **Any) -> Union[Tuple[Text, Dict[None, None]], None]
121121
if not os.path.exists(self.outdir):
122122
os.makedirs(self.outdir)
123123

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ ruamel.yaml == 0.12.4
33
rdflib >= 4.1.0
44
rdflib-jsonld >= 0.3.0
55
shellescape
6-
schema-salad==1.18.20160930145650
6+
schema-salad==1.20.20161122192122
77
typing>=3.5.2
88
cwltest>=1.0.20160907111242

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
'rdflib >= 4.1.0',
4949
'rdflib-jsonld >= 0.3.0',
5050
'shellescape',
51-
'schema-salad >= 1.18.20161005190847',
51+
'schema-salad >= 1.20.20161122192122, < 2',
5252
'typing >= 3.5.2',
5353
'cwltest >= 1.0.20160907111242'],
5454
setup_requires=[

typeshed/2.7/__builtin__.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ class file(BinaryIO):
911911
@overload
912912
def __init__(self, file: unicode, mode: str = 'r', buffering: int = ...) -> None: ...
913913
@overload
914-
def __init__(file: int, mode: str = 'r', buffering: int = ...) -> None: ...
914+
def __init__(self, file: int, mode: str = 'r', buffering: int = ...) -> None: ...
915915
def __iter__(self) -> Iterator[str]: ...
916916
def read(self, n: int = ...) -> str: ...
917917
def __enter__(self) -> BinaryIO: ...

0 commit comments

Comments
 (0)