From 03f5792d109cca57f9a6dd585461e3622a9c74c5 Mon Sep 17 00:00:00 2001 From: Eric Biagiotti Date: Thu, 10 Jan 2019 09:16:37 -0500 Subject: [PATCH] 13306: Fixed formatting for newly introduced imports Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti --- 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 | 7 ++++--- 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, 62 insertions(+), 42 deletions(-) diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py index d2f04b5dd0..191ee8bb8e 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 bd8ab1137e..2d1f7d2111 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 b878c4d9b6..ff95041779 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 fc2d0e8767..d9a986663b 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 dbe4992cba..92e8727aab 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 708b81818c..3baa7835f5 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 9b3649a61a..59c646ccd3 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 7353d7239c..484b2093b7 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 e736d9ef00..cc3ea969df 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 9f6390e307..70cbcaf0a7 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 f7d7c071ce..d75fec6c63 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 bd23cdd0af..fa35fe7da6 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 f32ab8000a..d6a4c24a78 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 674e8fc60d..04e67b7dbd 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 9ad7300b3a..de21fc0b92 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 34f2bbb9d7..88bd49fcd3 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 387d12f388..6bc9ac0a4b 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 73f9fc90cb..562d1765da 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 5d2d0d0111..4da2b12038 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 88eb2fd513..818cfb778a 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 -- 2.30.2