Next

.github/workflows/ci.yml

@@ -8,15 +8,18 @@ on:
 jobs:
   mypy:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       with:
-        python-version: '3.10'
+        python-version: ${{matrix.python-version}}
         architecture: x64
-    - run: pip install nox==2019.11.9
+    - run: pip install nox==2022.11.21
     - run: pip install poetry==1.2.2
-    - run: nox --session mypy
+    - run: nox --session mypy-${{matrix.python-version}}
 
   test:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
   - id: check-json
   - id: end-of-file-fixer
   repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.5.0
 - hooks:
   - args:
     - --in-place
@@ -22,15 +22,10 @@ repos:
     - --ignore-init-module-imports
     id: autoflake
   repo: https://github.com/myint/autoflake
-  rev: v2.0.0
-
-- repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v2.2.0
-  hooks:
-  - id: setup-cfg-fmt
+  rev: v2.3.1
 
 - repo: https://github.com/asottile/reorder_python_imports
-  rev: v3.9.0
+  rev: v3.12.0
   hooks:
   - args:
     - --py37-plus
@@ -40,31 +35,29 @@ repos:
     - --py37-plus
     id: pyupgrade
   repo: https://github.com/asottile/pyupgrade
-  rev: v3.3.1
+  rev: v3.15.2
 - hooks:
   - id: black
   repo: https://github.com/psf/black
-  rev: 22.12.0
+  rev: 24.3.0
 - hooks:
-  - additional_dependencies:
-    - black==20.8b1
-    id: blacken-docs
+  - id: blacken-docs
   repo: https://github.com/asottile/blacken-docs
-  rev: v1.12.1
+  rev: 1.16.0
 
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.5.0
+  rev: v2.12.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix, --indent, '2']
 
 - hooks:
   - id: blackdoc
   repo: https://github.com/keewis/blackdoc
-  rev: v0.3.8
+  rev: v0.3.9
 - hooks:
   - id: commitizen
     stages:
     - commit-msg
   repo: https://github.com/commitizen-tools/commitizen
-  rev: v2.38.0
+  rev: v3.20.0

CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.6.2 (2024-03-25)
+
+### Fix
+
+- minimize (yield) to None
+- minimization of MatchClass
+- minimization of default arguments
+- minimize slice correctly
+
 ## v0.6.1 (2023-11-29)
 
 ### Fix

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pysource-minimize"
-version = "0.6.1"
+version = "0.6.2"
 description = "minimize python source code"
 authors = ["Frank Hoffmann"]
 license = "MIT"

pysource_minimize/__init__.py

@@ -5,4 +5,4 @@
 __all__ = ("minimize", "StopMinimization")
 
 
-version = "0.6.1"
+version = "0.6.2"

pysource_minimize/_minimize_base.py

@@ -109,6 +109,7 @@ def wrap(value):
                     ("arguments", "kw_defaults"),
                     ("Nonlocal", "names"),
                     ("Global", "names"),
+                    ("MatchClass", "kwd_attrs"),
                 ]:
                     setattr(node, name, wrap(value))
 
@@ -306,11 +307,17 @@ def try_none(self, node):
             return True
         return self.try_with({node.__index: None})
 
-    def try_only(self, node, child) -> bool:
-        if isinstance(child, list):
-            return self.try_with({node.__index: [c.__index for c in child]})
-        else:
-            return self.try_with({node.__index: child.__index})
+    def try_only(self, node, *childs) -> bool:
+        for child in childs:
+            if isinstance(child, list):
+                if self.try_with({node.__index: [c.__index for c in child]}):
+                    return True
+            elif child is None:
+                continue
+            else:
+                if self.try_with({node.__index: child.__index}):
+                    return True
+        return False
 
     def try_only_minimize(self, node, *childs):
         childs = [child for child in childs if child is not None]

pysource_minimize/_minimize_structure.py

@@ -37,6 +37,8 @@ def minimize(self, o):
             return self.minimize_list(o, self.minimize)
         elif isinstance(o, ast.arg):
             return self.minimize_arg(o)
+        elif isinstance(o, ast.pattern):
+            pass
         elif isinstance(o, ValueWrapper):
             pass
         else:
@@ -106,7 +108,12 @@ def minimize_expr(self, node):
             # todo minimize values
 
         elif isinstance(node, ast.Slice):
-            self.try_only_minimize(node, node.lower, node.upper, node.step)
+            if self.try_only(node, node.lower, node.upper, node.step):
+                return
+
+            for child in (node.lower, node.upper, node.step):
+                if not self.try_none(child):
+                    self.minimize(child)
 
         elif isinstance(node, ast.ExtSlice):
             self.minimize_list(node.dims, minimal=1)
@@ -133,6 +140,9 @@ def minimize_expr(self, node):
         elif isinstance(node, ast.Await):
             self.try_only_minimize(node, node.value)
         elif isinstance(node, ast.Yield):
+            if node.value is None:
+                if self.try_node(node, ast.Constant(value=None, kind="")):
+                    return
             self.try_only_minimize(node, node.value)
         elif isinstance(node, ast.YieldFrom):
             self.try_only_minimize(node, node.value)
@@ -242,18 +252,7 @@ def minimize_pattern(pattern):
                 elif isinstance(pattern, ast.MatchClass):
                     self.minimize(pattern.cls)
                     self.minimize_list(pattern.patterns, minimize_pattern)
-
-                    new_attrs = list(pattern.kwd_attrs)
-
-                    for i in reversed(range(len(pattern.kwd_patterns))):
-                        try_attrs = [v for j, v in enumerate(new_attrs) if j != i]
-                        if self.try_with(
-                            {
-                                self.index_of(pattern.kwd_patterns[i]): [],
-                                (self.index_of(pattern), "kwd_attrs"): try_attrs,
-                            }
-                        ):
-                            new_attrs = try_attrs
+                    self.minimize_lists((pattern.kwd_attrs, pattern.kwd_patterns))
 
             self.minimize(c.body)
 
@@ -282,17 +281,25 @@ def minimize_args_of(self, func):
 
         split = len(all_args) - len(args.defaults)
         self.minimize_list(all_args[:split])
-        remaining = self.minimize_lists((all_args[split:], args.defaults))
+        remaining = self.minimize_lists(
+            (all_args[split:], args.defaults), (self.minimize, lambda a: None)
+        )
 
+        remove_defaults = True
         for _, default in remaining:
-            if default is not None:
-                if not self.try_without([default]):
-                    break
+            if remove_defaults:
+                if default is not None:
+                    if not self.try_without([default]):
+                        self.minimize(default)
+                        remove_defaults = False
+            else:
+                self.minimize(default)
 
-        remaining = self.minimize_lists((args.kwonlyargs, args.kw_defaults))
+        remaining = self.minimize_lists(
+            (args.kwonlyargs, args.kw_defaults), (self.minimize, lambda a: None)
+        )
         for _, default in remaining:
-            if default is not None:
-                self.try_none(default)
+            self.minimize_optional(default)
 
         self.minimize_optional(args.vararg)
         self.minimize_optional(args.kwarg)
@@ -417,7 +424,7 @@ def minimize_stmt(self, node):
                 ),
             ):
                 self.minimize(node.target)
-                self.minimize(node.value)
+                self.minimize_optional(node.value)
                 self.minimize(node.annotation)
 
         elif isinstance(node, (ast.For, ast.AsyncFor)):
@@ -501,7 +508,6 @@ def minimize_item(item: ast.withitem):
                 # cause requires exc
                 # `raise from cause` is not valid
                 if self.get_ast(node).cause:
-                    coverage_required()
                     self.minimize(node.exc)
                 else:
                     coverage_required()

tests/needle_samples/43a15edfd4d8b5a43cacef6ab98db8d95fa506a8fc61314a15a51091f663c47a.py

@@ -0,0 +1 @@
+name_2[needle_17597:]

tests/remove_one_samples/036c7a6dbcd5408a20379fa3202f445472bacce96d8b2b440c93574eb190acf0.py

@@ -0,0 +1 @@
+raise b'' from 't'

tests/remove_one_samples/622304cbf3785ec23201b087777987082588575bf1a655cb149b5b8265cb5880.py

@@ -0,0 +1 @@
+lambda: (yield)

tests/remove_one_samples/63890583393ab421a3d313bfb47dbe592c2719deca366700e69ece4108e54816.py

@@ -0,0 +1,2 @@
+def name_1(*, name_3={name_2: name_0 for name_2 in name_1}):
+    pass

tests/remove_one_samples/700fc9198bc41fd1bcababa9d79912d06bd460a8f444e8777b04d61689386115.py

@@ -0,0 +1 @@
+name_0[name_2:name_1:name_2]

tests/remove_one_samples/734ceba9c4d2e94e04e202bcd1e1521c462c79dcd491f3ca1886af12e923dd9a.py

@@ -0,0 +1,2 @@
+def name_2(name_5=f'{name_1!s}'):
+    pass

tests/remove_one_samples/9d9831b2acca227a19ee1e570d936bb9f61f29abf9fe0ca8e1e9c887902c95c8.py

@@ -0,0 +1,3 @@
+match name_0:
+    case name_0(-0.1, name_5=name_5.name_3, name_0=b''):
+        pass