13306: Fixed formatting for newly introduced imports

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index d2f04b5dd0f7b1df07f06f6d20eeeb5341945722..191ee8bb8ea323862d42f4c9c1cef8a105ed4f96 100644 (file)
--- 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 bd8ab1137e9b4eda0e006162812bf8ea12d7bc7d..2d1f7d2111f45492cb2ec1b3f81116e76bfaaa4a 100644 (file)
--- 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 b878c4d9b64b9eb710fc852ed07e046a5b6bacf1..ff95041779f0e37d2a10113b7cf7d9146f9076f6 100644 (file)
--- 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 fc2d0e8767faadf727a5332e91d6ff1b0ebb569e..d9a986663b83ec1eb79024181e89cbb87cd570ee 100644 (file)
--- 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 dbe4992cbad338ef6c875c6167fab9f102185538..92e8727aaba86bfaefd8cf8a1e949f3a74fd3990 100644 (file)
--- 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 708b81818cb80e147cc1c0edb6a680e690daaef6..3baa7835f50a9cfc4e1a110070cdcb4cd9923f63 100644 (file)
--- 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 9b3649a61a871afa73e8ba3482fed8dc700b4128..59c646ccd3231a7468b90a65731aeedced13ae84 100644 (file)
--- 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 7353d7239c2578622e7c409bd829d5e9e5fb1e80..484b2093b71adadb95c1d030bbe7470a425e48b7 100644 (file)
--- 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 e736d9ef00d53800562d641471d9bcd38a572643..cc3ea969df99cb000119cc60ffd5c29c28656d01 100644 (file)
--- 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 9f6390e3073e63d6482d404ec52d7330c6ddd40c..70cbcaf0a73ca031e4fde22176fdc19fe6532835 100644 (file)
--- 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 f7d7c071ce11cb1355debd4442a1586175aa7dc5..d75fec6c63e719949d6f19b7d2813d9f828262a6 100644 (file)
--- 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 bd23cdd0af46f9a22ce10496da01de5c540d88c3..fa35fe7da6380baf1f82cb8a890e21e9e31a7afd 100644 (file)
--- 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 f32ab8000a0a1c7ddb1d48fa214527dd7152ecdb..d6a4c24a785e0ca6258550dee4b41c2cc01b9ad7 100644 (file)
--- 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 674e8fc60de10afe1cf9c36f878ce3c52a0e03f5..04e67b7dbd48aaefec075e77c2a8836d81cb2631 100644 (file)
--- 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 9ad7300b3a386809f45f4c6e20c7307f767c5bec..de21fc0b92d1c7437978be0a5018c3ea51fd76c3 100644 (file)
--- 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 34f2bbb9d71ba455ee2b40caddbe645638a4860d..88bd49fcd329faee02fc29f777adbdd41d3f21a2 100644 (file)
--- 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 387d12f388dc4fce6af87eb4de7a2e7dd267ce07..6bc9ac0a4bc7482f932a4ec7319548122fe2beb3 100644 (file)
--- 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 73f9fc90cbe0bcc19888ee2f0227c0e5da565346..562d1765daa24254cf4ad1a33b03af1129f57eff 100644 (file)
--- 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 5d2d0d01114b06659f548619121660e0c4b542ea..4da2b120386248f1b7fd9e3a1947de717f15d379 100644 (file)
--- 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 88eb2fd513c19a8359571d6aab3ac6777be95ff6..818cfb778a058fe94590990c2a53d0a94811cb2c 100644 (file)
--- 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