10110: add ruamel.yaml to setup.py

diff --git a/doc/user/topics/arv-copy.html.textile.liquid b/doc/user/topics/arv-copy.html.textile.liquid
index 76ff1c1f115624c9b5a38e16a29fa06d6c1f6d1b..abb1a6bcfc73b56cad9a7bab630ebb9497313b84 100644 (file)
--- a/doc/user/topics/arv-copy.html.textile.liquid
+++ b/doc/user/topics/arv-copy.html.textile.liquid
@@ -88,7 +88,7 @@ We will use the uuid @zzzzz-7fd4e-sampleworkflow1@ as an example workflow.
 
 <notextile>
 <pre><code>~$ <span class="userinput">arv-copy --src zzzzz --dst dst_cluster --dst-git-repo $USER/tutorial zzzzz-7fd4e-sampleworkflow1</span>
-zzzzz-4zz18-jidprdejysravcr: 1143M / 1143M 100.0% 
+zzzzz-4zz18-jidprdejysravcr: 1143M / 1143M 100.0%
 2017-01-04 04:11:58 arvados.arv-copy[5906] INFO:
 2017-01-04 04:11:58 arvados.arv-copy[5906] INFO: Success: created copy with uuid dst_cluster-7fd4e-ojtgpne594ubkt7
 </code></pre>

diff --git a/sdk/python/arvados/commands/arv_copy.py b/sdk/python/arvados/commands/arv_copy.py
index 1af6aa701bf3b2ccda4ed5d9ec042484bae1c6e4..5c5192860ccd0ed6b079c98d76b164c2ed3800a6 100755 (executable)
--- a/sdk/python/arvados/commands/arv_copy.py
+++ b/sdk/python/arvados/commands/arv_copy.py
@@ -113,7 +113,7 @@ def main():
     copy_opts.set_defaults(recursive=True)
 
     parser = argparse.ArgumentParser(
-        description='Copy a pipeline instance, template or collection from one Arvados instance to another.',
+        description='Copy a pipeline instance, template, workflow, or collection from one Arvados instance to another.',
         parents=[copy_opts, arv_cmd.retry_opt])
     args = parser.parse_args()
 
@@ -435,7 +435,7 @@ def copy_workflow(wf_uuid, src, dst, args):
             if graph is not None:
                 workflow_collections(graph, locations, docker_images)
             else:
-                workflow_collections(graph, locations, docker_images)
+                workflow_collections(wf_def, locations, docker_images)
 
             if locations:
                 copy_collections(locations, src, dst, args)
@@ -455,9 +455,7 @@ def workflow_collections(obj, locations, docker_images):
             if loc.startswith("keep:"):
                 locations.append(loc[5:])
 
-        docker_image = obj.get('dockerImageId', None)
-        if docker_image is None:
-            docker_image = obj.get('dockerPull', None)
+        docker_image = obj.get('dockerImageId', None) or obj.get('dockerPull', None)
         if docker_image is not None:
             ds = docker_image.split(":", 1)
             tag = ds[1] if len(ds)==2 else 'latest'
@@ -465,8 +463,7 @@ def workflow_collections(obj, locations, docker_images):
 
         for x in obj:
             workflow_collections(obj[x], locations, docker_images)
-
-    if isinstance(obj, list):
+    elif isinstance(obj, list):
         for x in obj:
             workflow_collections(x, locations, docker_images)
 

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index d470ab4d0046f01a40017d9aaa58dc0e231b1c51..0dc59e543bdac20edf02046e09943a1421eda783 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -51,7 +51,8 @@ setup(name='arvados-python-client',
           'pycurl >=7.19.5.1, <7.21.5',
           'python-gflags<3.0',
           'setuptools',
-          'ws4py'
+          'ws4py',
+          'ruamel.yaml==0.13.7'
       ],
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],