Skip to content

Commit c84b1e8

Browse files
authored
ensure that default Files have sizes (#761)
* specify NodeJS version on appveyor
1 parent 3de0d12 commit c84b1e8

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ format: autopep8
105105
## pylint : run static code analysis on Python code
106106
pylint: $(PYSOURCES)
107107
pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
108-
$^ || true
108+
$^ -j$(shell nproc)|| true
109109

110110
pylint_report.txt: ${PYSOURCES}
111111
pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
112-
$^ > pylint_report.txt || true
112+
$^ -j$(shell nproc)> pylint_report.txt || true
113113

114114
diff_pylint_report: pylint_report.txt
115115
diff-quality --violations=pylint pylint_report.txt

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ environment:
2525
PYTHON_ARCH: "64"
2626

2727
install:
28+
- ps: 'Install-Product node 0.12 x64'
2829
- "%PYTHON%\\python.exe -m pip install -U wheel pytest mock"
2930
- "%PYTHON%\\python.exe -m pip show setuptools"
3031
- "%PYTHON%\\python.exe -m pip install -U setuptools^>=20.3"

cwltool/process.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
from . import expression
3535
from .validate_js import validate_js_expressions
36-
from .utils import cmp_like_py2
36+
from .utils import cmp_like_py2, add_sizes
3737
from .builder import Builder
3838
from .errors import UnsupportedRequirement, WorkflowException
3939
from .pathmapper import (PathMapper, adjustDirObjs, get_listing,
@@ -363,6 +363,7 @@ def fillInDefaults(inputs, job):
363363
job[fieldname] = None
364364
else:
365365
raise WorkflowException("Missing required input parameter '%s'" % shortname(inp["id"]))
366+
add_sizes(job)
366367

367368

368369
def avroize_type(field_type, name_prefix=""):

tests/test_fetch.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@
1111
from cwltool.load_tool import load_tool
1212
from cwltool.main import main
1313
from cwltool.workflow import defaultMakeTool
14-
from cwltool.resolver import resolve_local
14+
from cwltool.resolver import resolve_local, Path
1515
from cwltool.utils import onWindows
1616

17-
if sys.version_info < (3, 4):
18-
from pathlib2 import Path
19-
else:
20-
from pathlib import Path
21-
2217
from .util import get_data
2318

2419
class FetcherTest(unittest.TestCase):

0 commit comments

Comments
 (0)