From: Tom Clegg <tom@tomclegg.ca>
Date: Fri, 14 Feb 2020 20:12:40 +0000 (-0500)
Subject: Merge branch '16039-fuse-forward-slash-sub'
X-Git-Tag: 2.1.0~298
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/48c38895200cdafaaeca37299bf8352878389a77?hp=-c

Merge branch '16039-fuse-forward-slash-sub'

fixes #16039

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

48c38895200cdafaaeca37299bf8352878389a77
diff --combined sdk/cwl/setup.py
index 62ceab2fa1,07d6beffd6..d4bb6d102a
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@@ -36,7 -36,8 +36,8 @@@ setup(name='arvados-cwl-runner'
            'bin/arvados-cwl-runner',
        ],
        # Note that arvados/build/run-build-packages.sh looks at this
-       # file to determine what version of cwltool and schema-salad to build.
+       # file to determine what version of cwltool and schema-salad to
+       # build.
        install_requires=[
            'cwltool==1.0.20190831161204',
            'schema-salad==4.5.20190815125611',
@@@ -60,8 -61,8 +61,8 @@@
        ],
        test_suite='tests',
        tests_require=[
 -          'mock>=1.0',
 +          'mock>=1.0,<4',
            'subprocess32>=3.5.1',
        ],
-       zip_safe=True
-       )
+       zip_safe=True,
+ )