[ARVADOS] created: a5f237111e06d656b4f55a707626775c185b2faf

[Git user]

        at  a5f237111e06d656b4f55a707626775c185b2faf (commit)


commit a5f237111e06d656b4f55a707626775c185b2faf
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 17 10:51:42 2016 -0400

    10259: Update Gemfile to more recent arvados-cli to get a-r-p-i with bugfix #3486

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 5134fc4..ba5483a 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -73,7 +73,7 @@ gem 'faye-websocket'
 gem 'themes_for_rails'
 
 gem 'arvados', '>= 0.1.20150615153458'
-gem 'arvados-cli', '>= 0.1.20151207150126'
+gem 'arvados-cli', '>= 0.1.20161017144806'
 
 # pg_power lets us use partial indexes in schema.rb in Rails 3
 gem 'pg_power'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 1fb4369..70d2749 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -42,12 +42,12 @@ GEM
       i18n (~> 0)
       json (~> 1.7, >= 1.7.7)
       jwt (>= 0.1.5, < 2)
-    arvados-cli (0.1.20160503204200)
+    arvados-cli (0.1.20161017144806)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1, >= 0.1.20150128223554)
       curb (~> 0.8)
-      google-api-client (~> 0.6, >= 0.6.3, < 0.9)
+      google-api-client (~> 0.6, >= 0.6.3, < 0.8.9)
       json (~> 1.7, >= 1.7.7)
       oj (~> 2.0, >= 2.0.3)
       trollop (~> 2.0)
@@ -236,7 +236,7 @@ DEPENDENCIES
   acts_as_api
   andand
   arvados (>= 0.1.20150615153458)
-  arvados-cli (>= 0.1.20151207150126)
+  arvados-cli (>= 0.1.20161017144806)
   coffee-rails (~> 3.2.0)
   database_cleaner
   factory_girl_rails

commit c9a412c0a5c13086c9cef714b88527ce6f962e52
Merge: c64df10 cece10f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 17 10:48:06 2016 -0400

    Merge remote-tracking branch 'remotes/origin/3486-parameter-value-nil-or-false' into 10259-cwl-pipeline-null


commit c64df10bb36d4db6ba3d9a790f7b50d49d8d37f7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 17 10:47:43 2016 -0400

    10259: When creating pipeline to be managed by a-r-p-i, wrap value in dict for
    false and null as well.

diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index 8269eee..a974531 100644
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -257,7 +257,7 @@ class RunnerJob(Runner):
         job_spec = self.arvados_job_spec(*args, **kwargs)
 
         for k,v in job_spec["script_parameters"].items():
-            if isinstance(v, dict):
+            if v is False or v is None or isinstance(v, dict):
                 job_spec["script_parameters"][k] = {"value": v}
 
         self.arvrunner.pipeline = self.arvrunner.api.pipeline_instances().create(

-----------------------------------------------------------------------


hooks/post-receive
--