Improved black-isort compatibility

labthings · Sep 4, 2020 · 1912de7 · 1912de7
1 parent 1610d97
commit 1912de7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,11 +36,12 @@ sphinx-rtd-theme = "^0.5.0"
 exclude = '(\.eggs|\.git|\.venv)'
 
 [tool.isort]
-multi_line_output=3
-include_trailing_comma=true
-force_grid_wrap=0
-use_parentheses=true
-line_length=88
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+ensure_newline_before_comments = true
+line_length = 88
 
 [build-system]
 requires = ["poetry>=0.12"]

diff --git a/src/labthings/labthing.py b/src/labthings/labthing.py
@@ -33,11 +33,6 @@
 # from apispec.ext.marshmallow import MarshmallowPlugin
 
 
-
-
-
-
-
 class LabThing:
     """
     The main entry point for the application.

diff --git a/src/labthings/views/__init__.py b/src/labthings/views/__init__.py
@@ -13,8 +13,7 @@
 from ..representations import DEFAULT_REPRESENTATIONS
 from ..schema import ActionSchema, Schema, build_action_schema
 from ..utilities import unpack
-from . import op
-from . import builder
+from . import builder, op
 
 __all__ = ["MethodView", "View", "ActionView", "PropertyView", "op", "builder"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,11 +33,6 @@ @@
     # from apispec.ext.marshmallow import MarshmallowPlugin
     class LabThing:
         """
         The main entry point for the application.
@@ Expand Down @@