[ARVADOS] updated: 5450d1417a31aaf2f71e16a440fcfee0a06be6c7

[Git user]

Summary of changes:
 sdk/cwl/setup.py                   |  2 +-
 sdk/python/arvados/commands/run.py | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

       via  5450d1417a31aaf2f71e16a440fcfee0a06be6c7 (commit)
       via  f9f7ccc13963e52b60a10d99806b00a1de66833f (commit)
       via  133d751f665ccf24fde56d1f8acf23f9a3475927 (commit)
      from  8539a6c20fecc7bed02f1c7f81d3d2a1c0974e1f (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 5450d1417a31aaf2f71e16a440fcfee0a06be6c7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 21 20:19:55 2016 -0400

    8654: Bump arvados-cwl-runner version dependency on arvados python client.

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 69d8017..45c2cf8 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -31,7 +31,7 @@ setup(name='arvados-cwl-runner',
       ],
       install_requires=[
           'cwltool>=1.0.20160311170456',
-          'arvados-python-client>=0.1.20160321204431'
+          'arvados-python-client>=0.1.20160322001610'
       ],
       test_suite='tests',
       tests_require=['mock>=1.0'],

commit f9f7ccc13963e52b60a10d99806b00a1de66833f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 21 20:16:10 2016 -0400

    8654: When uploading, reuse existing collections with same owner/name/PDH

diff --git a/sdk/python/arvados/commands/run.py b/sdk/python/arvados/commands/run.py
index 643d3f5..ad442d5 100644
--- a/sdk/python/arvados/commands/run.py
+++ b/sdk/python/arvados/commands/run.py
@@ -148,12 +148,21 @@ def uploadfiles(files, api, dry_run=False, num_retries=0, project=None, fnPatter
                 stream = sp[0]
                 collection.start_new_stream(stream)
             collection.write_file(f.fn, sp[1])
-        body = {"owner_uuid": project, "manifest_text": collection.manifest_text()}
-        if name is not None:
-            body["name"] = name
-        item = api.collections().create(body=body, ensure_unique_name=True).execute()
+
+        exists = api.collections().list(filters=[["owner_uuid", "=", project],
+                                                 ["portable_data_hash", "=", collection.portable_data_hash()],
+                                                 ["name", "=", name]]).execute(num_retries=num_retries)
+        if exists["items"]:
+            item = exists["items"][0]
+            logger.info("Using collection %s", item["uuid"])
+        else:
+            body = {"owner_uuid": project, "manifest_text": collection.manifest_text()}
+            if name is not None:
+                body["name"] = name
+            item = api.collections().create(body=body, ensure_unique_name=True).execute()
+            logger.info("Uploaded to %s", item["uuid"])
+
         pdh = item["portable_data_hash"]
-        logger.info("Uploaded to %s", item["uuid"])
 
     for c in files:
         c.fn = fnPattern % (pdh, c.fn)

commit 133d751f665ccf24fde56d1f8acf23f9a3475927
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 21 17:09:49 2016 -0400

    8654: Bump arvados-cwl-runner version dependency on arvados python client.

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 3fc7433..69d8017 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -31,7 +31,7 @@ setup(name='arvados-cwl-runner',
       ],
       install_requires=[
           'cwltool>=1.0.20160311170456',
-          'arvados-python-client>=0.1.20160219154918'
+          'arvados-python-client>=0.1.20160321204431'
       ],
       test_suite='tests',
       tests_require=['mock>=1.0'],

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


hooks/post-receive
--