Remove trailig white-space

Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic@capeannenterprises.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 014e8e58cfb74cd7564422c76d85fb99f94911f4..a7f160c6c307ae0432e968c8a27eb9aef20a345f 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -158,9 +158,9 @@ class ArvadosContainer(object):
                 keepemptydirs(vwd)
 
                 info = self._get_intermediate_collection_info()
-                vwd.save_new(name=info["name"], 
-                             ensure_unique_name=True, 
-                             trash_at=info["trash_at"], 
+                vwd.save_new(name=info["name"],
+                             ensure_unique_name=True,
+                             trash_at=info["trash_at"],
                              properties=info["properties"])
 
                 prev = None
@@ -330,19 +330,19 @@ class ArvadosContainer(object):
             self.output_callback(outputs, processStatus)
 
     def _get_intermediate_collection_info(self):
-            trash_time = None 
-            if self.arvrunner.intermediate_output_ttl > 0: 
-                trash_time = datetime.datetime.now() + datetime.timedelta(seconds=self.arvrunner.intermediate_output_ttl) 
-
-            current_container_uuid = None 
-            try: 
-                current_container = self.arvrunner.api.containers().current().execute(num_retries=self.arvrunner.num_retries) 
-                current_container_uuid = current_container['uuid'] 
-            except ApiError as e: 
-                # Status code 404 just means we're not running in a container. 
-                if e.resp.status != 404: 
+            trash_time = None
+            if self.arvrunner.intermediate_output_ttl > 0:
+                trash_time = datetime.datetime.now() + datetime.timedelta(seconds=self.arvrunner.intermediate_output_ttl)
+
+            current_container_uuid = None
+            try:
+                current_container = self.arvrunner.api.containers().current().execute(num_retries=self.arvrunner.num_retries)
+                current_container_uuid = current_container['uuid']
+            except ApiError as e:
+                # Status code 404 just means we're not running in a container.
+                if e.resp.status != 404:
                     logger.info("Getting current container: %s", e)
-            props = {"type": "Intermediate", 
+            props = {"type": "Intermediate",
                           "container": current_container_uuid}
 
             return {"name" : "Intermediate collection",

diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index ea599ea8371caaba0cae30a8f97a010ff13f1425..332c6a7b9fb3383c13ce23e606a4243fe286d7a5 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -69,9 +69,9 @@ class ArvadosJob(object):
                 if vwd:
                     with Perf(metrics, "generatefiles.save_new %s" % self.name):
                         info = self._get_intermediate_collection_info()
-                        vwd.save_new(name=info["name"], 
-                                     ensure_unique_name=True, 
-                                     trash_at=info["trash_at"], 
+                        vwd.save_new(name=info["name"],
+                                     ensure_unique_name=True,
+                                     trash_at=info["trash_at"],
                                      properties=info["properties"])
 
                 for f, p in generatemapper.items():
@@ -271,19 +271,19 @@ class ArvadosJob(object):
             self.output_callback(outputs, processStatus)
 
     def _get_intermediate_collection_info(self):
-            trash_time = None 
-            if self.arvrunner.intermediate_output_ttl > 0: 
-                trash_time = datetime.datetime.now() + datetime.timedelta(seconds=self.arvrunner.intermediate_output_ttl) 
-
-            current_container_uuid = None 
-            try: 
-                current_container = self.arvrunner.api.containers().current().execute(num_retries=self.arvrunner.num_retries) 
-                current_container_uuid = current_container['uuid'] 
-            except ApiError as e: 
-                # Status code 404 just means we're not running in a container. 
-                if e.resp.status != 404: 
+            trash_time = None
+            if self.arvrunner.intermediate_output_ttl > 0:
+                trash_time = datetime.datetime.now() + datetime.timedelta(seconds=self.arvrunner.intermediate_output_ttl)
+
+            current_container_uuid = None
+            try:
+                current_container = self.arvrunner.api.containers().current().execute(num_retries=self.arvrunner.num_retries)
+                current_container_uuid = current_container['uuid']
+            except ApiError as e:
+                # Status code 404 just means we're not running in a container.
+                if e.resp.status != 404:
                     logger.info("Getting current container: %s", e)
-            props = {"type": "Intermediate", 
+            props = {"type": "Intermediate",
                           "container": current_container_uuid}
 
             return {"name" : "Intermediate collection",

diff --git a/sdk/cwl/arvados_cwl/pathmapper.py b/sdk/cwl/arvados_cwl/pathmapper.py
index b54fcdcc7b68f2d78c9fa8414271a8e298339a45..76676944358da571e4a5f61c9ab02995fbe49e21 100644 (file)
--- a/sdk/cwl/arvados_cwl/pathmapper.py
+++ b/sdk/cwl/arvados_cwl/pathmapper.py
@@ -158,9 +158,9 @@ class ArvPathMapper(PathMapper):
                 info = self._get_intermediate_collection_info()
 
                 c.save_new(name=info["name"],
-                           owner_uuid=self.arvrunner.project_uuid, 
-                           ensure_unique_name=True, 
-                           trash_at=info["trash_at"], 
+                           owner_uuid=self.arvrunner.project_uuid,
+                           ensure_unique_name=True,
+                           trash_at=info["trash_at"],
                            properties=info["properties"])
 
                 ab = self.collection_pattern % c.portable_data_hash()
@@ -176,9 +176,9 @@ class ArvPathMapper(PathMapper):
                 info = self._get_intermediate_collection_info()
 
                 c.save_new(name=info["name"],
-                           owner_uuid=self.arvrunner.project_uuid, 
-                           ensure_unique_name=True, 
-                           trash_at=info["trash_at"], 
+                           owner_uuid=self.arvrunner.project_uuid,
+                           ensure_unique_name=True,
+                           trash_at=info["trash_at"],
                            properties=info["properties"])
 
                 ab = self.file_pattern % (c.portable_data_hash(), srcobj["basename"])
@@ -213,19 +213,19 @@ class ArvPathMapper(PathMapper):
             return None
 
     def _get_intermediate_collection_info(self):
-            trash_time = None 
-            if self.arvrunner.intermediate_output_ttl > 0: 
-                trash_time = datetime.datetime.now() + datetime.timedelta(seconds=self.arvrunner.intermediate_output_ttl) 
-
-            current_container_uuid = None 
-            try: 
-                current_container = self.arvrunner.api.containers().current().execute(num_retries=self.arvrunner.num_retries) 
-                current_container_uuid = current_container['uuid'] 
-            except ApiError as e: 
-                # Status code 404 just means we're not running in a container. 
-                if e.resp.status != 404: 
+            trash_time = None
+            if self.arvrunner.intermediate_output_ttl > 0:
+                trash_time = datetime.datetime.now() + datetime.timedelta(seconds=self.arvrunner.intermediate_output_ttl)
+
+            current_container_uuid = None
+            try:
+                current_container = self.arvrunner.api.containers().current().execute(num_retries=self.arvrunner.num_retries)
+                current_container_uuid = current_container['uuid']
+            except ApiError as e:
+                # Status code 404 just means we're not running in a container.
+                if e.resp.status != 404:
                     logger.info("Getting current container: %s", e)
-            props = {"type": "Intermediate", 
+            props = {"type": "Intermediate",
                           "container": current_container_uuid}
 
             return {"name" : "Intermediate collection",