Merge branch 'master' into 11100-cwl-set-output-ttl
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 26 May 2017 18:21:01 +0000 (14:21 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 26 May 2017 18:21:01 +0000 (14:21 -0400)
1  2 
sdk/cwl/arvados_cwl/__init__.py
sdk/cwl/arvados_cwl/arv-cwl-schema.yml
sdk/cwl/arvados_cwl/runner.py
sdk/cwl/setup.py
sdk/cwl/tests/test_submit.py

Simple merge
Simple merge
index efed1cc72dcb84a77e79e8ab3d5d3184b55c0009,02c612fa905c50504a2dce7874708cd87050b0ba..df988f69918e337f8a2a1e91346bbf35dc8a1878
@@@ -52,9 -52,8 +52,9 @@@ setup(name='arvados-cwl-runner'
            'schema-salad==2.5.20170428142041',
            'typing==3.5.3.0',
            'ruamel.yaml==0.13.7',
-           'arvados-python-client>=0.1.20170327195441',
+           'arvados-python-client>=0.1.20170526013812',
 -          'setuptools'
 +          'setuptools',
 +          'ciso8601'
        ],
        data_files=[
            ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
Simple merge