Add isort to make import order more consistent.

Author: manthey

example-average-color/cli_list.py

@@ -1,7 +1,7 @@
 import json
 import os
-import sys
 import subprocess
+import sys
 
 
 def processCLI(filename):

slicer_cli_web/__init__.py

@@ -16,9 +16,15 @@
 
 # These two imports must be in this order for appropriate side effects
 
+# isort: off
+
 from . import ctk_cli_adjustment  # noqa
+
 from ctk_cli import CLIArgumentParser  # noqa
 
+# isort: on
+
+
 try:
     from importlib.metadata import PackageNotFoundError
     from importlib.metadata import version as _importlib_version

slicer_cli_web/cli_list_entrypoint.py

@@ -1,8 +1,8 @@
-import os
-import sys
-import json
 import argparse
+import json
+import os
 import subprocess
+import sys
 import textwrap as _textwrap
 
 try:

slicer_cli_web/cli_utils.py

@@ -3,7 +3,6 @@
 
 from .ctk_cli_adjustment import CLIModule
 
-
 return_parameter_file_name = 'returnparameterfile'
 
 SLICER_TYPE_TO_GIRDER_MODEL_MAP = {

slicer_cli_web/config.py

@@ -15,12 +15,12 @@
 #############################################################################
 
 from girder.api.rest import getCurrentUser
-from girder.models.folder import Folder
 from girder.constants import AccessType
-from girder.models.setting import Setting
-from girder.utility import setting_utilities
 from girder.exceptions import ValidationException
+from girder.models.folder import Folder
+from girder.models.setting import Setting
 from girder.settings import SettingDefault
+from girder.utility import setting_utilities
 
 
 # Constants representing the setting keys for this plugin

slicer_cli_web/girder_worker_plugin/direct_docker_run.py

@@ -1,11 +1,11 @@
-from os import access, R_OK
-from os.path import basename, isfile, abspath, join
+from os import R_OK, access
+from os.path import abspath, basename, isfile, join
 
 from girder_worker.app import app
-from girder_worker.docker.transforms import BindMountVolume, ContainerStdOut
 from girder_worker.docker.io import FDReadStreamConnector
+from girder_worker.docker.tasks import DockerTask, _docker_run
+from girder_worker.docker.transforms import BindMountVolume, ContainerStdOut
 from girder_worker.docker.transforms.girder import GirderFileIdToVolume
-from girder_worker.docker.tasks import _docker_run, DockerTask
 from girder_worker_utils import _walk_obj
 from girder_worker_utils.transforms.girder_io import GirderClientTransform
 

slicer_cli_web/models/__init__.py

@@ -1,5 +1,4 @@
+from .docker_image import CLIItem, DockerImageItem
 from .exceptions import DockerImageError, DockerImageNotFoundError
-from .docker_image import DockerImageItem, CLIItem
-
 
 __all__ = ('DockerImageError', 'DockerImageNotFoundError', 'DockerImageItem', 'CLIItem')

slicer_cli_web/models/parser.py

@@ -1,14 +1,13 @@
 import json
-from jsonschema import validate
-from os.path import join, dirname
-import yaml
-
+from os.path import dirname, join
 
+import yaml
 from girder.models.file import File
+from jsonschema import validate
+
 from ..cli_utils import as_model
 from .json_to_xml import json_to_xml
 
-
 with open(join(dirname(__file__), 'schema.json')) as f:
     json_schema = json.load(f)
 

slicer_cli_web/rest_slicer_cli.py

@@ -1,13 +1,12 @@
-import cherrypy
 import itertools
 import time
 
+import cherrypy
 from bson.objectid import ObjectId
-
 from girder import logger
 from girder.api import access
 from girder.api.describe import Description, describeRoute
-from girder.api.rest import Resource, boundHandler, RestException, getCurrentToken, getApiUrl
+from girder.api.rest import Resource, RestException, boundHandler, getApiUrl, getCurrentToken
 from girder.constants import SortDir
 from girder.models.item import Item
 from girder.models.setting import Setting
@@ -16,11 +15,10 @@
 from girder_jobs.constants import JobStatus
 from girder_jobs.models.job import Job
 
-from .cli_utils import as_model, generate_description, get_cli_parameters, \
-    return_parameter_file_name
+from .cli_utils import (as_model, generate_description, get_cli_parameters,
+                        return_parameter_file_name)
 from .models import CLIItem
-from .prepare_task import prepare_task, OPENAPI_DIRECT_TYPES, FOLDER_SUFFIX
-
+from .prepare_task import FOLDER_SUFFIX, OPENAPI_DIRECT_TYPES, prepare_task
 
 _return_parameter_file_desc = """
     Filename in which to write simple return parameters

small-docker/Example1/Example1.py

@@ -1,7 +1,6 @@
 import pprint
 
-from slicer_cli_web import ctk_cli_adjustment  # noqa - imported for side effects
-from ctk_cli import CLIArgumentParser
+from slicer_cli_web import CLIArgumentParser
 
 
 def main(args):