[ARVADOS] updated: 53468cf5e609c4456d1bfd24aeb74c326ff6a8b7
Git user
git at public.curoverse.com
Mon Dec 19 09:47:23 EST 2016
Summary of changes:
sdk/cwl/arvados_cwl/arvjob.py | 5 +++--
sdk/cwl/arvados_cwl/crunch_script.py | 1 +
sdk/dev-jobs.dockerfile | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
via 53468cf5e609c4456d1bfd24aeb74c326ff6a8b7 (commit)
via 5fe2a0ab78c82b67b92434596d554bedda1d4259 (commit)
via a092ab09fab941057e5cc44d93886676d542bdd6 (commit)
from ad0712ccdb7ad3d01ab4fc0d4f1a15dc7443b18a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 53468cf5e609c4456d1bfd24aeb74c326ff6a8b7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Dec 19 09:42:31 2016 -0500
Adjust arvados repo minimum script versions for job dispatch. no issue #
diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index aba2f21..69666a8 100644
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -121,7 +121,7 @@ class ArvadosJob(object):
"script": "crunchrunner",
"repository": "arvados",
"script_version": "master",
- "minimum_script_version": "9e5b98e8f5f4727856b53447191f9c06e3da2ba6",
+ "minimum_script_version": "a3f2cb186e437bfce0031b024b2157b73ed2717d",
"script_parameters": {"tasks": [script_parameters]},
"runtime_constraints": runtime_constraints
},
@@ -247,7 +247,8 @@ class RunnerJob(Runner):
return {
"script": "cwl-runner",
- "script_version": __version__,
+ "script_version": "master",
+ "minimum_script_version": "570509ab4d2ef93d870fd2b1f2eab178afb1bad9",
"repository": "arvados",
"script_parameters": self.job_order,
"runtime_constraints": {
commit 5fe2a0ab78c82b67b92434596d554bedda1d4259
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Dec 16 16:58:19 2016 -0500
Fix dev build of arvados/jobs image to avoid installing versions of
pyasn1-modules incompatible with pyasn1. no issue #
diff --git a/sdk/dev-jobs.dockerfile b/sdk/dev-jobs.dockerfile
index bd80a0c..38fefd0 100644
--- a/sdk/dev-jobs.dockerfile
+++ b/sdk/dev-jobs.dockerfile
@@ -14,7 +14,7 @@ MAINTAINER Ward Vandewege <ward at curoverse.com>
ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update -q && apt-get install -qy git python-pip python-virtualenv python-dev libcurl4-gnutls-dev libgnutls28-dev nodejs
+RUN apt-get update -q && apt-get install -qy git python-pip python-virtualenv python-dev libcurl4-gnutls-dev libgnutls28-dev nodejs python-pyasn1-modules
RUN pip install -U setuptools
commit a092ab09fab941057e5cc44d93886676d542bdd6
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Dec 19 09:25:34 2016 -0500
Fix crunch_script.py to pass name arg, refs #10681
diff --git a/sdk/cwl/arvados_cwl/crunch_script.py b/sdk/cwl/arvados_cwl/crunch_script.py
index 849b177..6f84d68 100644
--- a/sdk/cwl/arvados_cwl/crunch_script.py
+++ b/sdk/cwl/arvados_cwl/crunch_script.py
@@ -90,6 +90,7 @@ def run():
args.quiet = False
args.ignore_docker_for_reuse = False
args.basedir = os.getcwd()
+ args.name = None
args.cwl_runner_job={"uuid": arvados.current_job()["uuid"], "state": arvados.current_job()["state"]}
outputObj = runner.arv_executor(t, job_order_object, **vars(args))
except Exception as e:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list