12934: Bump cwltool version for packing fix.

[arvados.git] / sdk / cwl / setup.py

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index f9cf60813e27fbaca845e353b6e937bb0fd2c441..88e3d80db35293a5fab4aec7dbd4db023e26a943 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -1,7 +1,11 @@
 #!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 
 import os
 import sys
+import subprocess
 import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
@@ -9,23 +13,18 @@ from setuptools import setup, find_packages
 SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
 
-try:
-    import gittaggers
-    tagger = gittaggers.EggInfoFromGit
-except ImportError:
-    tagger = egg_info_cmd.egg_info
-
-try:
-    gitinfo = subprocess.check_output(
-        ['git', 'log', '--first-parent', '--max-count=1',
-         '--format=format:%H']).strip()
-    with open("arvados_cwl/_version.py", "w") as f:
-        f.write("__version__ = '%s'\n" % gitinfo)
-except:
-    pass
+tagger = egg_info_cmd.egg_info
+version = os.environ.get("ARVADOS_BUILDING_VERSION")
+if not version:
+    version = "1.0"
+    try:
+        import gittaggers
+        tagger = gittaggers.EggInfoFromGit
+    except ImportError:
+        pass
 
 setup(name='arvados-cwl-runner',
-      version='1.0',
+      version=version,
       description='Arvados Common Workflow Language runner',
       long_description=open(README).read(),
       author='Arvados',
@@ -37,13 +36,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.20180116213856',
+          'schema-salad==2.6.20171201034858',
+          'typing==3.5.3.0',
+          'ruamel.yaml==0.13.7',
+          'arvados-python-client>=0.1.20170526013812',
+          'setuptools',
+          'ciso8601 >=1.0.0, <=1.0.4',
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),