[ARVADOS] updated: 1.3.0-149-ga2a531ec3

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/arvcontainer.py | 2 +-
 sdk/cwl/tests/test_job.py           | 4 ++--
 sdk/cwl/tests/test_util.py          | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

       via  a2a531ec3c8fb543382c9520073954c886ee5434 (commit)
       via  bc1f8d47b8233b00a449edb38f4c4bde8f5d9163 (commit)
      from  aa95ea325564f844472c1278615ff083a33cb151 (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 a2a531ec3c8fb543382c9520073954c886ee5434
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Fri Jan 11 13:55:49 2019 -0500

    13306: Adding py2 and py3 compatible byte objects for literals
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py
index ab72af3f2..281e8b428 100644
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@ -442,7 +442,7 @@ class TestWorkflow(unittest.TestCase):
 
         mockc.open().__enter__().write.assert_has_calls([mock.call(subwf)])
         mockc.open().__enter__().write.assert_has_calls([mock.call(
-b'''{
+bytes(b'''{
   "fileblub": {
     "basename": "token.txt",
     "class": "File",
@@ -450,7 +450,7 @@ b'''{
     "size": 0
   },
   "sleeptime": 5
-}''')])
+}'''))])
 
     # The test passes no builder.resources
     # Hence the default resources will apply: {'cores': 1, 'ram': 1024, 'outdirSize': 1024, 'tmpdirSize': 1024}
diff --git a/sdk/cwl/tests/test_util.py b/sdk/cwl/tests/test_util.py
index 0166a1c25..d58882271 100644
--- a/sdk/cwl/tests/test_util.py
+++ b/sdk/cwl/tests/test_util.py
@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from builtins import bytes
+
 import unittest
 import mock
 import datetime
@@ -39,7 +41,7 @@ class TestUtil(unittest.TestCase):
 
     def test_get_current_container_error(self):
         api = mock.MagicMock()
-        api.containers().current().execute.side_effect = ApiError(httplib2.Response({"status": 300}), b"")
+        api.containers().current().execute.side_effect = ApiError(httplib2.Response({"status": 300}), bytes(b""))
         logger = mock.MagicMock()
 
-        self.assertRaises(ApiError, get_current_container(api, num_retries=0, logger=logger))
+        self.assertRaises(ApiError, get_current_container(api, num_retries=0, logger=logger))
\ No newline at end of file

commit bc1f8d47b8233b00a449edb38f4c4bde8f5d9163
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Fri Jan 11 11:22:24 2019 -0500

    13306: Updated use of built in 'sorted' and a test_util bytestring
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 191ee8bb8..47fbfa5a7 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -140,7 +140,7 @@ class ArvadosContainer(JobBase):
                 generatemapper = NoFollowPathMapper(self.generatefiles["listing"], "", "",
                                                     separateDirs=False)
 
-                sorteditems = sorted(list(generatemapper.items()), None, key=lambda n: n[1].target)
+                sorteditems = sorted(list(generatemapper.items()), key=lambda n: n[1].target)
 
                 logger.debug("generatemapper is %s", sorteditems)
 
diff --git a/sdk/cwl/tests/test_util.py b/sdk/cwl/tests/test_util.py
index 2532bd596..0166a1c25 100644
--- a/sdk/cwl/tests/test_util.py
+++ b/sdk/cwl/tests/test_util.py
@@ -39,7 +39,7 @@ class TestUtil(unittest.TestCase):
 
     def test_get_current_container_error(self):
         api = mock.MagicMock()
-        api.containers().current().execute.side_effect = ApiError(httplib2.Response({"status": 300}), "")
+        api.containers().current().execute.side_effect = ApiError(httplib2.Response({"status": 300}), b"")
         logger = mock.MagicMock()
 
         self.assertRaises(ApiError, get_current_container(api, num_retries=0, logger=logger))

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


hooks/post-receive
--