[ARVADOS] updated: d458444b6de03c10dcddc80882887dab1d67b201

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 100 ++++++++++++++++++++++------------------
 sdk/cwl/setup.py                |   2 +-
 2 files changed, 55 insertions(+), 47 deletions(-)

       via  d458444b6de03c10dcddc80882887dab1d67b201 (commit)
       via  83cafb38e512275be28b1bdc1ac439adf8d9f553 (commit)
       via  42d4746b7e446811c98c518db03a986a3a499ae1 (commit)
       via  9032247f9281283eeebb68e4cb5bf586236ba4bd (commit)
       via  a59cf490d81c559b658dab9012a1f8d4327ca354 (commit)
      from  341066e5326e35c303993d365dfbbccf97b1c8b2 (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 d458444b6de03c10dcddc80882887dab1d67b201
Merge: 341066e 83cafb3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 14 10:20:11 2016 -0400

    Merge branch '8673-cwl-runner-project-uuid' closes #8673

diff --cc sdk/cwl/arvados_cwl/__init__.py
index 2e1f75b,f69591b..533d24a
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@@ -150,16 -150,11 +150,17 @@@ class ArvadosJob(object)
  
          (docker_req, docker_is_req) = get_feature(self, "DockerRequirement")
          if docker_req and kwargs.get("use_container") is not False:
-             runtime_constraints["docker_image"] = arv_docker_get_image(self.arvrunner.api, docker_req, pull_image)
+             runtime_constraints["docker_image"] = arv_docker_get_image(self.arvrunner.api, docker_req, pull_image, self.arvrunner.project_uuid)
  
 +        resources = self.builder.resources
 +        if resources is not None:
 +            runtime_constraints["min_cores_per_node"] = resources.get("cores", 1)
 +            runtime_constraints["min_ram_mb_per_node"] = resources.get("ram")
 +            runtime_constraints["min_scratch_mb_per_node"] = resources.get("tmpdirSize", 0) + resources.get("outdirSize", 0)
 +
          try:
              response = self.arvrunner.api.jobs().create(body={
+                 "owner_uuid": self.arvrunner.project_uuid,
                  "script": "crunchrunner",
                  "repository": "arvados",
                  "script_version": "master",
diff --cc sdk/cwl/setup.py
index 1deb766,aec4f22..3fc7433
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@@ -30,11 -30,9 +30,11 @@@ setup(name='arvados-cwl-runner'
            'bin/arvados-cwl-runner'
        ],
        install_requires=[
-           'cwltool>=1.0.20160308152645',
+           'cwltool>=1.0.20160311170456',
            'arvados-python-client>=0.1.20160219154918'
        ],
 +      test_suite='tests',
 +      tests_require=['mock>=1.0'],
        zip_safe=True,
        cmdclass={'egg_info': tagger},
        )

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


hooks/post-receive
--