X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e8a76617eeec9429ddf7879048a310ba6e15e0d8..cbe0ab4581008c47ab2dfc569e2494f4fc51f844:/sdk/cwl/setup.py

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 4adcac4daf..762c6fda39 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 
 import os
 import sys
@@ -20,7 +23,7 @@ versionfile = os.path.join(SETUP_DIR, "arvados_cwl/_version.py")
 try:
     gitinfo = subprocess.check_output(
         ['git', 'log', '--first-parent', '--max-count=1',
-         '--format=format:%H', SETUP_DIR]).strip()
+         '--format=format:%H', gittaggers.choose_version_from()]).strip()
     with open(versionfile, "w") as f:
         f.write("__version__ = '%s'\n" % gitinfo)
 except Exception as e:
@@ -43,13 +46,18 @@ setup(name='arvados-cwl-runner',
       package_data={'arvados_cwl': ['arv-cwl-schema.yml']},
       scripts=[
           'bin/cwl-runner',
-          'bin/arvados-cwl-runner'
+          'bin/arvados-cwl-runner',
       ],
-      # Make sure to update arvados/build/run-build-packages.sh as well
-      # when updating the cwltool version pin.
+      # Note that arvados/build/run-build-packages.sh looks at this
+      # file to determine what version of cwltool and schema-salad to build.
       install_requires=[
-          'cwltool==1.0.20161007181528',
-          'arvados-python-client>=0.1.20160826210445'
+          'cwltool==1.0.20170928192020',
+          'schema-salad==2.6.20170927145003',
+          'typing==3.5.3.0',
+          'ruamel.yaml==0.13.7',
+          'arvados-python-client>=0.1.20170526013812',
+          'setuptools',
+          'ciso8601',
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),