2.13.0 development

.isort.cfg

@@ -1,3 +1,4 @@
 [tool.isort]
 profile = "black"
 multi_line_output = 3
+force_single_line = true

.pylintrc

@@ -60,95 +60,15 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-disable=print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
-        raw-checker-failed,
-        bad-inline-option,
-        locally-disabled,
-        file-ignored,
-        suppressed-message,
-        useless-suppression,
-        deprecated-pragma,
-        use-symbolic-message-instead,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape,
-        too-few-public-methods,           # due to typing.Protocol
+disable=too-few-public-methods,           # due to typing.Protocol
         unsubscriptable-object,           # due to issue with typing.Optional[...] etc
         unused-import,                    # due to typecheck-specific imports
         cyclic-import,                    # honestly also due to typecheck-specific imports
         too-many-instance-attributes,     # a thing nobody cares about
         too-many-arguments,               # a thing nobody cares about
         too-many-locals,                  # a thing nobody cares about
-        no-self-use,                      # sometimes only protocol compliance matters
         duplicate-code,                   # due to interface code basically requiring duplicate lines
-        C0330, C0326:
+
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -597,6 +517,6 @@ valid-metaclass-classmethod-first-arg=cls
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception
 

changelog.json

@@ -355,6 +355,16 @@
                 "Allow #### (sprite name) and # (frame name)",
                 "Fix parsing of state modifiers with parentheses (e.g. Offset)"
             ]
+        },
+        {
+            "name": "2.13.8",
+            "changes": [
+                "Fix frames with '####' not being processed"
+            ]
+        },
+        {
+            "name": "2.14.0",
+            "changes": []
         }
     ]
 }

pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "zdcode"
-version = "2.13.7"
+version = "2.14.0"
 description = "A ZDoom DECORATE transpiler and mod content build system"
 authors = ["wallabra <[email protected]>"]
 license = "MIT"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10"
 parsy = "^1.4.0"
 attrs = "^20.3.0"
 

tests/new_keepst.zc2

@@ -0,0 +1,16 @@
+class JumpyTorch extends RedTorch {
+    macro Jump {
+        #### A 0 ThrustThingZ(0, 50, 0, 1);
+        #### BAB 3 [Bright];
+        #### A 5 [Bright];
+        #### A 20;
+        TRED A 2;
+    }
+
+    label Spawn {
+        x3 TRED ABCD 4 [Bright];
+        sometimes 5 inject Jump;
+        loop;
+    }
+}
+