10846: Remove duplicate log message suppression by ComputeNodeMonitorActor

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

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index c9875a47541849b1d8dccdff6e48a3df2323a2c2..178b5e85cfa7cf477ad41e2da1b221a075ad4053 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -16,15 +16,19 @@ try:
 except ImportError:
     tagger = egg_info_cmd.egg_info
 
+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']).strip()
-    with open("arvados_cwl/_version.py", "w") as f:
+         '--format=format:%H', gittaggers.choose_version_from()]).strip()
+    with open(versionfile, "w") as f:
         f.write("__version__ = '%s'\n" % gitinfo)
 except Exception as e:
-    print e
-    pass
+    # When installing from package, it won't be part of a git repository, and
+    # check_output() will raise an exception.  But the package should include the
+    # version file, so we can proceed.
+    if not os.path.exists(versionfile):
+        raise
 
 setup(name='arvados-cwl-runner',
       version='1.0',
@@ -41,11 +45,14 @@ setup(name='arvados-cwl-runner',
           'bin/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.20170119234115',
+          'schema-salad==2.2.20170126160727',
+          'ruamel.yaml==0.13.7',
+          'arvados-python-client>=0.1.20170112173420',
+          'setuptools'
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),