Code formatting

Author: Joel Collins

pyproject.toml

@@ -35,6 +35,13 @@ sphinx-rtd-theme = "^0.5.0"
 [tool.black]
 exclude = '(\.eggs|\.git|\.venv)'
 
+[tool.isort]
+multi_line_output=3
+include_trailing_comma=true
+force_grid_wrap=0
+use_parentheses=true
+line_length=88
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"

src/labthings/__init__.py

@@ -1,12 +1,21 @@
 # Main LabThing class
 # Submodules
-from . import extensions, fields, json, marshalling, semantics, views
+from . import extensions, fields, json, marshalling, views
 # Action threads
-from .actions import (ActionKilledException, current_action,
-                      update_action_data, update_action_progress)
+from .actions import (
+    ActionKilledException,
+    current_action,
+    update_action_data,
+    update_action_progress,
+)
 # Functions to speed up finding global objects
-from .find import (current_labthing, find_component, find_extension,
-                   registered_components, registered_extensions)
+from .find import (
+    current_labthing,
+    find_component,
+    find_extension,
+    registered_components,
+    registered_extensions,
+)
 from .labthing import LabThing
 # Quick-create app+LabThing function
 from .quick import create_app

src/labthings/actions/__init__.py

@@ -5,8 +5,7 @@
     "ActionKilledException",
 ]
 
-from .pool import (Pool, current_action, update_action_data,
-                   update_action_progress)
+from .pool import Pool, current_action, update_action_data, update_action_progress
 from .thread import ActionKilledException, ActionThread
 
 __all__ = [

src/labthings/fields.py

@@ -3,10 +3,37 @@
 
 from marshmallow import ValidationError
 from marshmallow.fields import (
-    URL, UUID, AwareDateTime, Bool, Boolean, Constant, Date, DateTime, Decimal,
-    Dict, Email, Field, Float, Function, Int, Integer, List, Mapping, Method,
-    NaiveDateTime, Nested, Number, Pluck, Raw, Str, String, Time, TimeDelta,
-    Tuple, Url)
+    URL,
+    UUID,
+    AwareDateTime,
+    Bool,
+    Boolean,
+    Constant,
+    Date,
+    DateTime,
+    Decimal,
+    Dict,
+    Email,
+    Field,
+    Float,
+    Function,
+    Int,
+    Integer,
+    List,
+    Mapping,
+    Method,
+    NaiveDateTime,
+    Nested,
+    Number,
+    Pluck,
+    Raw,
+    Str,
+    String,
+    Time,
+    TimeDelta,
+    Tuple,
+    Url,
+)
 
 __all__ = [
     "Bytes",

src/labthings/json/marshmallow_jsonschema/base.py

@@ -7,8 +7,7 @@
 from marshmallow.class_registry import get_class
 
 from .exceptions import UnsupportedValueError
-from .validation import (handle_length, handle_one_of, handle_range,
-                         handle_regexp)
+from .validation import handle_length, handle_one_of, handle_range, handle_regexp
 
 __all__ = ("JSONSchema",)
 

src/labthings/labthing.py

@@ -19,8 +19,12 @@
 from .httperrorhandler import SerializedExceptionHandler
 from .json.encoder import LabThingsJSONEncoder
 from .logging import LabThingLogger
-from .names import (ACTION_ENDPOINT, ACTION_LIST_ENDPOINT,
-                    EXTENSION_LIST_ENDPOINT, EXTENSION_NAME)
+from .names import (
+    ACTION_ENDPOINT,
+    ACTION_LIST_ENDPOINT,
+    EXTENSION_LIST_ENDPOINT,
+    EXTENSION_NAME,
+)
 from .representations import DEFAULT_REPRESENTATIONS
 from .td import ThingDescription
 from .utilities import camel_to_snake, clean_url_string

tests/test_default_views_socket_handler.py

@@ -1,5 +1,4 @@
-from labthings.default_views.sockets import (process_socket_message,
-                                             socket_handler)
+from labthings.default_views.sockets import process_socket_message, socket_handler
 
 
 def test_socket_handler(thing_ctx, fake_websocket):

tests/test_json_marshmallow_jsonschema.py

@@ -2,8 +2,7 @@
 from jsonschema import Draft7Validator
 
 from labthings import fields
-from labthings.json.marshmallow_jsonschema import (JSONSchema,
-                                                   UnsupportedValueError)
+from labthings.json.marshmallow_jsonschema import JSONSchema, UnsupportedValueError
 from labthings.schema import Schema, validate