Fix lints (#664)

With upgrading to Python 3.12 in CI, new lints popped up.
While at it, bumping flake8's version as well.

Author: robsdedude

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
         exclude: ^diagrams/
         args: [ --markdown-linebreak-ext=md ]
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
       - id: flake8
         additional_dependencies:

boltstub/packstream.py

@@ -23,9 +23,9 @@
 from struct import pack as struct_pack
 from struct import unpack as struct_unpack
 
-from .simple_jolt.common import types as jolt_common_types
-from .simple_jolt.v1 import types as jolt_v1_types
-from .simple_jolt.v2 import types as jolt_v2_types
+from .simple_jolt.common import jolt_types as jolt_common_types
+from .simple_jolt.v1 import jolt_types as jolt_v1_types
+from .simple_jolt.v2 import jolt_types as jolt_v2_types
 
 _jolt_types = {
     1: jolt_v1_types,

boltstub/parsing.py

@@ -46,7 +46,7 @@
     ServerExit,
 )
 from .packstream import Structure
-from .simple_jolt.common.types import (
+from .simple_jolt.common.jolt_types import (
     JoltType,
     JoltWildcard,
 )

boltstub/simple_jolt/common/types.py renamed to boltstub/simple_jolt/common/jolt_types.py

@@ -27,7 +27,7 @@
     NoFullRepresentation,
     NoSimpleRepresentation,
 )
-from .types import (
+from .jolt_types import (
     JoltDate,
     JoltDateTime,
     JoltDuration,

boltstub/simple_jolt/v1/codec.py

@@ -23,9 +23,9 @@
 import pytz
 
 from ..common.errors import JOLTValueError
-from ..common.types import _JoltParsedType
-from ..common.types import JoltType as _JoltTypeCommon
-from ..common.types import JoltWildcard
+from ..common.jolt_types import _JoltParsedType
+from ..common.jolt_types import JoltType as _JoltTypeCommon
+from ..common.jolt_types import JoltWildcard
 
 
 class JoltType(_JoltTypeCommon):  # version specific type base class

boltstub/simple_jolt/v1/types.py renamed to boltstub/simple_jolt/v1/jolt_types.py

@@ -42,7 +42,7 @@
     JoltReverseRelationTransformer,
     JoltTypeTransformer,
 )
-from .types import (
+from .jolt_types import (
     JoltDate,
     JoltDateTime,
     JoltDuration,

boltstub/simple_jolt/v2/codec.py

@@ -20,11 +20,11 @@
 
 import pytz
 
-from ..common.types import (
+from ..common.jolt_types import (
     JoltType,
     JoltWildcard,
 )
-from ..v1.types import (
+from ..v1.jolt_types import (
     JoltV1DateMixin,
     JoltV1DateTimeMixin,
     JoltV1DurationMixin,

boltstub/simple_jolt/v2/types.py renamed to boltstub/simple_jolt/v2/jolt_types.py

@@ -18,7 +18,7 @@
 
 import json
 
-from ....simple_jolt.v1.types import (
+from ....simple_jolt.v1.jolt_types import (
     JoltDate,
     JoltDateTime,
     JoltDuration,

boltstub/tests/simple_jolt/v1/parse_data.py

@@ -26,7 +26,7 @@
     dumps_simple,
     loads,
 )
-from ....simple_jolt.v1.types import (
+from ....simple_jolt.v1.jolt_types import (
     JoltDate,
     JoltDateTime,
     JoltDuration,

boltstub/tests/simple_jolt/v1/test_parse.py

@@ -18,7 +18,7 @@
 
 import json
 
-from ....simple_jolt.v2.types import (
+from ....simple_jolt.v2.jolt_types import (
     JoltDate,
     JoltDateTime,
     JoltDuration,

boltstub/tests/simple_jolt/v2/parse_data.py

@@ -26,7 +26,7 @@
     dumps_simple,
     loads,
 )
-from ....simple_jolt.v2.types import (
+from ....simple_jolt.v2.jolt_types import (
     JoltDate,
     JoltDateTime,
     JoltDuration,

boltstub/tests/simple_jolt/v2/test_parse.py

@@ -21,8 +21,8 @@
 import pytest
 
 from ..bolt_protocol import Structure
-from ..simple_jolt.v1 import types as jolt_v1_types
-from ..simple_jolt.v2 import types as jolt_v2_types
+from ..simple_jolt.v1 import jolt_types as jolt_v1_types
+from ..simple_jolt.v2 import jolt_types as jolt_v2_types
 
 
 @pytest.mark.parametrize(("packstream_version", "fields", "res"), (

boltstub/tests/test_packstream.py

@@ -12,7 +12,7 @@ remove_redundant_aliases=true
 
 [flake8]
 inline-quotes=double
-ignore=A003,D100,D101,D102,D103,D104,D105,D106,D107,E241,W503
+ignore=A003,D100,D101,D102,D103,D104,D105,D106,D107,E241,W503,F824
 per-file-ignores=
     nutkit/protocol/requests.py:N803,A002
     nutkit/protocol/responses.py:N803,A002

setup.cfg

@@ -473,7 +473,7 @@ def test_multiple_notifications(self):
                     "_severity": "WARNING",
                     "_classification": "GENERIC",
                     "_position": {"column": 9, "offset": 8, "line": 1 + i},
-                },
+                },  # noqa: E122 - looks better
             }
             for i in range(1, 4)
         ]