[ARVADOS] updated: 1.3.0-144-gd52bf8474

Git user git at public.curoverse.com
Thu Jan 10 09:38:43 EST 2019 

Summary of changes:
 sdk/cwl/arvados_cwl/arvcontainer.py  | 7 ++++---
 sdk/cwl/arvados_cwl/arvjob.py        | 5 +++--
 sdk/cwl/arvados_cwl/arvworkflow.py   | 3 ++-
 sdk/cwl/arvados_cwl/crunch_script.py | 3 ++-
 sdk/cwl/arvados_cwl/executor.py      | 7 ++++---
 sdk/cwl/arvados_cwl/fsaccess.py      | 7 ++++---
 sdk/cwl/arvados_cwl/http.py          | 7 ++++---
 sdk/cwl/arvados_cwl/pathmapper.py    | 7 ++++---
 sdk/cwl/arvados_cwl/perf.py          | 3 ++-
 sdk/cwl/arvados_cwl/runner.py        | 5 +++--
 sdk/cwl/arvados_cwl/task_queue.py    | 7 ++++---
 sdk/cwl/arvados_version.py           | 5 +++--
 sdk/cwl/gittaggers.py                | 5 +++--
 sdk/cwl/tests/matcher.py             | 3 ++-
 sdk/cwl/tests/test_container.py      | 5 +++--
 sdk/cwl/tests/test_http.py           | 5 +++--
 sdk/cwl/tests/test_job.py            | 9 +++++----
 sdk/cwl/tests/test_make_output.py    | 5 +++--
 sdk/cwl/tests/test_submit.py         | 7 ++++---
 sdk/cwl/tests/wf/check_mem.py        | 1 +
 20 files changed, 63 insertions(+), 43 deletions(-)

       via  d52bf847478dbb92d068e27bcea36fdeee34a9a7 (commit)
       via  03f5792d109cca57f9a6dd585461e3622a9c74c5 (commit)
      from  d6cccb3ea4e5f076a436d9935e3835d4b620b859 (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 d52bf847478dbb92d068e27bcea36fdeee34a9a7
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Thu Jan 10 09:38:37 2019 -0500

    13306: Fix for sdk/cwl tests.test_job.TestJob.test_run
    
    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 6bc9ac0a4..99466e3f3 100644
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@ -130,7 +130,7 @@ class TestJob(unittest.TestCase):
                     # sharing link on the job
                     runner.api.links().create.side_effect = ApiError(
                         mock.MagicMock(return_value={'status': 403}),
-                        'Permission denied')
+                        bytes(b'Permission denied'))
                     j.run(runtimeContext)
                 else:
                     assert not runner.api.links().create.called

commit 03f5792d109cca57f9a6dd585461e3622a9c74c5
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Thu Jan 10 09:16:37 2019 -0500

    13306: Fixed formatting for newly introduced imports
    
    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 d2f04b5dd..191ee8bb8 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -1,10 +1,11 @@
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from future import standard_library
+standard_library.install_aliases()
+from builtins import str
+
 import logging
 import json
 import os
diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index bd8ab1137..2d1f7d211 100644
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -1,9 +1,10 @@
-from past.builtins import basestring
-from builtins import object
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from past.builtins import basestring
+from builtins import object
+
 import logging
 import re
 import copy
diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py
index b878c4d9b..ff9504177 100644
--- a/sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/sdk/cwl/arvados_cwl/arvworkflow.py
@@ -1,8 +1,9 @@
-from past.builtins import basestring
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from past.builtins import basestring
+
 import os
 import json
 import copy
diff --git a/sdk/cwl/arvados_cwl/crunch_script.py b/sdk/cwl/arvados_cwl/crunch_script.py
index fc2d0e876..d9a986663 100644
--- a/sdk/cwl/arvados_cwl/crunch_script.py
+++ b/sdk/cwl/arvados_cwl/crunch_script.py
@@ -1,4 +1,3 @@
-from past.builtins import basestring
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
@@ -11,6 +10,8 @@ from past.builtins import basestring
 # tool.  When the workflow completes, record the output object in an output
 # collection for this runner job.
 
+from past.builtins import basestring
+
 import arvados
 import arvados_cwl
 import arvados.collection
diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index dbe4992cb..92e8727aa 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -1,10 +1,11 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from __future__ import division
 from builtins import next
 from builtins import object
 from past.utils import old_div
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
 
 import argparse
 import logging
diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py
index 708b81818..3baa7835f 100644
--- a/sdk/cwl/arvados_cwl/fsaccess.py
+++ b/sdk/cwl/arvados_cwl/fsaccess.py
@@ -1,10 +1,11 @@
-from future import standard_library
-standard_library.install_aliases()
-from builtins import object
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from future import standard_library
+standard_library.install_aliases()
+from builtins import object
+
 import fnmatch
 import os
 import errno
diff --git a/sdk/cwl/arvados_cwl/http.py b/sdk/cwl/arvados_cwl/http.py
index 9b3649a61..59c646ccd 100644
--- a/sdk/cwl/arvados_cwl/http.py
+++ b/sdk/cwl/arvados_cwl/http.py
@@ -1,10 +1,11 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from __future__ import division
 from future import standard_library
 standard_library.install_aliases()
 from past.utils import old_div
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
 
 import requests
 import email.utils
diff --git a/sdk/cwl/arvados_cwl/pathmapper.py b/sdk/cwl/arvados_cwl/pathmapper.py
index 7353d7239..484b2093b 100644
--- a/sdk/cwl/arvados_cwl/pathmapper.py
+++ b/sdk/cwl/arvados_cwl/pathmapper.py
@@ -1,10 +1,11 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from future import standard_library
 standard_library.install_aliases()
 from builtins import str
 from past.builtins import basestring
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
 
 import re
 import logging
diff --git a/sdk/cwl/arvados_cwl/perf.py b/sdk/cwl/arvados_cwl/perf.py
index e736d9ef0..cc3ea969d 100644
--- a/sdk/cwl/arvados_cwl/perf.py
+++ b/sdk/cwl/arvados_cwl/perf.py
@@ -1,8 +1,9 @@
-from builtins import object
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from builtins import object
+
 import time
 import uuid
 
diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 9f6390e30..70cbcaf0a 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -1,9 +1,10 @@
-from future import standard_library
-standard_library.install_aliases()
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from future import standard_library
+standard_library.install_aliases()
+
 import os
 import urllib.parse
 from functools import partial
diff --git a/sdk/cwl/arvados_cwl/task_queue.py b/sdk/cwl/arvados_cwl/task_queue.py
index f7d7c071c..d75fec6c6 100644
--- a/sdk/cwl/arvados_cwl/task_queue.py
+++ b/sdk/cwl/arvados_cwl/task_queue.py
@@ -1,10 +1,11 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from future import standard_library
 standard_library.install_aliases()
 from builtins import range
 from builtins import object
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
 
 import queue
 import threading
diff --git a/sdk/cwl/arvados_version.py b/sdk/cwl/arvados_version.py
index bd23cdd0a..fa35fe7da 100644
--- a/sdk/cwl/arvados_version.py
+++ b/sdk/cwl/arvados_version.py
@@ -1,9 +1,10 @@
-from builtins import str
-from builtins import next
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from builtins import str
+from builtins import next
+
 import subprocess
 import time
 import os
diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index f32ab8000..d6a4c24a7 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -1,9 +1,10 @@
-from builtins import str
-from builtins import next
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from builtins import str
+from builtins import next
+
 from setuptools.command.egg_info import egg_info
 import subprocess
 import time
diff --git a/sdk/cwl/tests/matcher.py b/sdk/cwl/tests/matcher.py
index 674e8fc60..04e67b7db 100644
--- a/sdk/cwl/tests/matcher.py
+++ b/sdk/cwl/tests/matcher.py
@@ -1,8 +1,9 @@
-from builtins import object
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from builtins import object
+
 import difflib
 import json
 import re
diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index 9ad7300b3..de21fc0b9 100644
--- a/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@ -1,9 +1,10 @@
-from builtins import str
-from builtins import object
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from builtins import str
+from builtins import object
+
 import arvados_cwl
 import arvados_cwl.context
 import arvados_cwl.util
diff --git a/sdk/cwl/tests/test_http.py b/sdk/cwl/tests/test_http.py
index 34f2bbb9d..88bd49fcd 100644
--- a/sdk/cwl/tests/test_http.py
+++ b/sdk/cwl/tests/test_http.py
@@ -1,9 +1,10 @@
-from future import standard_library
-standard_library.install_aliases()
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from future import standard_library
+standard_library.install_aliases()
+
 import copy
 import io
 import functools
diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py
index 387d12f38..6bc9ac0a4 100644
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@ -1,10 +1,11 @@
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from future import standard_library
+standard_library.install_aliases()
+from builtins import str
+
 import functools
 import json
 import logging
diff --git a/sdk/cwl/tests/test_make_output.py b/sdk/cwl/tests/test_make_output.py
index 73f9fc90c..562d1765d 100644
--- a/sdk/cwl/tests/test_make_output.py
+++ b/sdk/cwl/tests/test_make_output.py
@@ -1,9 +1,10 @@
-from future import standard_library
-standard_library.install_aliases()
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from future import standard_library
+standard_library.install_aliases()
+
 import functools
 import json
 import logging
diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index 5d2d0d011..4da2b1203 100644
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -1,10 +1,11 @@
-from future import standard_library
-standard_library.install_aliases()
-from builtins import object
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from future import standard_library
+standard_library.install_aliases()
+from builtins import object
+
 import copy
 import io
 import functools
diff --git a/sdk/cwl/tests/wf/check_mem.py b/sdk/cwl/tests/wf/check_mem.py
index 88eb2fd51..818cfb778 100644
--- a/sdk/cwl/tests/wf/check_mem.py
+++ b/sdk/cwl/tests/wf/check_mem.py
@@ -5,6 +5,7 @@
 from __future__ import print_function
 from __future__ import division
 from past.utils import old_div
+
 import arvados
 import sys
 import os

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


hooks/post-receive
--

More information about the arvados-commits mailing list