[ARVADOS] created: 1.3.0-141-g523dbe6ef

[Git user]

        at  523dbe6efe87983ad3f1ac93a5dedfa104302650 (commit)


commit 523dbe6efe87983ad3f1ac93a5dedfa104302650
Author: ebiagiotti <ebiagiotti at veritasgenetics.com>
Date:   Mon Jan 7 20:38:58 2019 +0000

    13306: Changes to arvados-cwl-runner code after running futurize --stage1
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index 27774b2f7..31ac4c247 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -660,7 +660,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
                            runtimeContext)
 
         if runtimeContext.submit and not runtimeContext.wait:
-            runnerjob = jobiter.next()
+            runnerjob = next(jobiter)
             runnerjob.run(runtimeContext)
             return (runnerjob.uuid, "success")
 
diff --git a/sdk/cwl/tests/federation/framework/check_exist.py b/sdk/cwl/tests/federation/framework/check_exist.py
index b3338939e..1458772a3 100644
--- a/sdk/cwl/tests/federation/framework/check_exist.py
+++ b/sdk/cwl/tests/federation/framework/check_exist.py
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import print_function
 import arvados
 import json
 
diff --git a/sdk/cwl/tests/federation/framework/prepare.py b/sdk/cwl/tests/federation/framework/prepare.py
index 6fe90813e..40bb843b2 100644
--- a/sdk/cwl/tests/federation/framework/prepare.py
+++ b/sdk/cwl/tests/federation/framework/prepare.py
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import print_function
 import arvados
 import json
 
diff --git a/sdk/cwl/tests/hw.py b/sdk/cwl/tests/hw.py
index 99c26523e..e45bd7264 100644
--- a/sdk/cwl/tests/hw.py
+++ b/sdk/cwl/tests/hw.py
@@ -2,4 +2,5 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-print "Hello world"
+from __future__ import print_function
+print("Hello world")
diff --git a/sdk/cwl/tests/wf/check_mem.py b/sdk/cwl/tests/wf/check_mem.py
index 355872232..bad16ed06 100644
--- a/sdk/cwl/tests/wf/check_mem.py
+++ b/sdk/cwl/tests/wf/check_mem.py
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import print_function
 import arvados
 import sys
 import os

commit 91bc40ccde4d224f32b8863eec2363c717093f8d
Author: ebiagiotti <ebiagiotti at veritasgenetics.com>
Date:   Mon Jan 7 16:19:21 2019 +0000

    13306: Adding a py3 variant of the sdk/cwl tests to run-tests.sh
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index cb4437256..87dfb9ab6 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -595,6 +595,7 @@ pythonstuff=(
     sdk/python
     sdk/python:py3
     sdk/cwl
+    sdk/cwl:py3
     services/dockercleaner:py3
     services/fuse
     services/nodemanager

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


hooks/post-receive
--