Merge pull request #89 from jedie/fixes

Fixes

pyproject.toml

@@ -110,7 +110,7 @@ build-backend = "poetry.masonry.api"
 [tool.darker]
 src = ['.']
 revision = "origin/main..."
-line_length = 120
+line_length = 100
 verbose = true
 skip_string_normalization = true
 diff = false
@@ -124,14 +124,14 @@ log_level = "INFO"
 
 
 [tool.flynt]
-line_length = 120
+line_length = 100
 
 
 [tool.isort]
 # https://pycqa.github.io/isort/docs/configuration/config_files/#pyprojecttoml-preferred-format
 atomic=true
 profile='black'
-line_length=120
+line_length=100
 skip_glob=[".*", "*/htmlcov/*","*/migrations/*","*/volumes/*"]
 known_first_party=["inventory","inventory_project","inventory_tests"]
 lines_after_imports=2

src/inventory/admin/item.py

@@ -8,7 +8,12 @@ from django.utils.translation import gettext_lazy as _
 from import_export.admin import ImportExportMixin
 from import_export.resources import ModelResource
 
-from inventory.admin.base import BaseFileModelInline, BaseImageModelInline, BaseUserAdmin, UserInlineMixin
+from inventory.admin.base import (
+    BaseFileModelInline,
+    BaseImageModelInline,
+    BaseUserAdmin,
+    UserInlineMixin,
+)
 from inventory.models import ItemLinkModel, ItemModel
 from inventory.models.item import ItemFileModel, ItemImageModel
 

src/inventory/admin/memo.py

@@ -7,7 +7,12 @@ from django.utils.translation import gettext_lazy as _
 from import_export.admin import ImportExportMixin
 from import_export.resources import ModelResource
 
-from inventory.admin.base import BaseFileModelInline, BaseImageModelInline, BaseUserAdmin, UserInlineMixin
+from inventory.admin.base import (
+    BaseFileModelInline,
+    BaseImageModelInline,
+    BaseUserAdmin,
+    UserInlineMixin,
+)
 from inventory.models import MemoLinkModel, MemoModel
 from inventory.models.memo import MemoFileModel, MemoImageModel
 

src/inventory_project/dev_shell.py

@@ -1,10 +1,9 @@
 import os
-import sys
 from pathlib import Path
 
 import cmd2
 from creole.setup_utils import assert_rst_readme, update_rst_readme
-from dev_shell.base_cmd2_app import DevShellBaseApp
+from dev_shell.base_cmd2_app import DevShellBaseApp, run_cmd2_app
 from dev_shell.command_sets import DevShellBaseCommandSet
 from dev_shell.command_sets.dev_shell_commands import DevShellCommandSet as OriginDevShellCommandSet
 from dev_shell.command_sets.dev_shell_commands import run_linters
@@ -257,5 +256,5 @@ def devshell_cmdloop():
     Entry point to start the "dev-shell" cmd2 app.
     Used in: [tool.poetry.scripts]
     """
-    c = DevShellApp(**get_devshell_app_kwargs())
+    app = DevShellApp(**get_devshell_app_kwargs())
-    sys.exit(c.cmdloop())
+    run_cmd2_app(app)  # Run a cmd2 App as CLI or shell