flake8_simplify 0.30.0__tar.gz → 0.31.0__tar.gz

{flake8_simplify-0.30.0 → flake8_simplify-0.31.0}/PKG-INFO

@@ -1,35 +1,36 @@
 Metadata-Version: 2.4
 Name: flake8_simplify
-Version: 0.30.0
+Version: 0.31.0
 Summary: flake8 plugin which checks for code that can be simplified
 Keywords: flake8
+Author: Martin Thoma
 Author-email: Martin Thoma <info@martin-thoma.de>
-Maintainer-email: Martin Thoma <info@martin-thoma.de>
-Requires-Python: >=3.9.0
-Description-Content-Type: text/markdown
+License-Expression: MIT
+License-File: LICENSE
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development
 Classifier: Framework :: Flake8
-License-File: LICENSE
 Requires-Dist: flake8>=3.7
+Maintainer: Martin Thoma
+Maintainer-email: Martin Thoma <info@martin-thoma.de>
+Requires-Python: >=3.10
 Project-URL: Homepage, https://github.com/MartinThoma/flake8-simplify
+Description-Content-Type: text/markdown
 
 [![PyPI version](https://badge.fury.io/py/flake8-simplify.svg)](https://badge.fury.io/py/flake8-simplify)
 [![Code on Github](https://img.shields.io/badge/Code-GitHub-brightgreen)](https://github.com/MartinThoma/flake8-simplify)
 [![Actions Status](https://github.com/MartinThoma/flake8-simplify/workflows/Unit%20Tests/badge.svg)](https://github.com/MartinThoma/flake8-simplify/actions)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 # flake8-simplify
 
@@ -43,7 +44,7 @@ Install with `pip`:
 pip install flake8-simplify
 ```
 
-Python 3.9 to 3.13 are supported.
+Python 3.10 to 3.14 are supported.
 
 
 ## Usage
@@ -653,4 +654,3 @@ dict.get(key, None)
 # Good
 dict.get(key)
 ```
-

{flake8_simplify-0.30.0 → flake8_simplify-0.31.0}/README.md

@@ -1,7 +1,6 @@
 [![PyPI version](https://badge.fury.io/py/flake8-simplify.svg)](https://badge.fury.io/py/flake8-simplify)
 [![Code on Github](https://img.shields.io/badge/Code-GitHub-brightgreen)](https://github.com/MartinThoma/flake8-simplify)
 [![Actions Status](https://github.com/MartinThoma/flake8-simplify/workflows/Unit%20Tests/badge.svg)](https://github.com/MartinThoma/flake8-simplify/actions)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 # flake8-simplify
 
@@ -15,7 +14,7 @@ Install with `pip`:
 pip install flake8-simplify
 ```
 
-Python 3.9 to 3.13 are supported.
+Python 3.10 to 3.14 are supported.
 
 
 ## Usage

{flake8_simplify-0.30.0 → flake8_simplify-0.31.0}/flake8_simplify/rules/ast_assign.py

@@ -3,6 +3,22 @@ import ast
 from flake8_simplify.utils import Assign, expression_uses_variable, to_source
 
 
+def _in_same_block(first: ast.stmt, second: ast.stmt) -> bool:
+    """
+    Check that both statements are part of the same statement list.
+
+    Siblings are linked across the fields of a node, so the last statement of
+    ``body`` has the first statement of ``orelse`` as next sibling.
+    """
+    parent = getattr(first, "parent", None)
+    if parent is None:
+        return True
+    for _, value in ast.iter_fields(parent):
+        if isinstance(value, list) and first in value:
+            return second in value
+    return True
+
+
 def get_sim904(node: ast.Assign) -> list[tuple[int, int, str]]:
     """
     Assign values to dictionary directly at initialization.
@@ -48,6 +64,7 @@ def get_sim904(node: ast.Assign) -> list[tuple[int, int, str]]:
         and isinstance(n2.targets[0].value, ast.Name)
         and isinstance(node.targets[0], ast.Name)
         and n2.targets[0].value.id == node.targets[0].id
+        and _in_same_block(node, n2)
     ):
         return errors
 

{flake8_simplify-0.30.0 → flake8_simplify-0.31.0}/flake8_simplify/rules/ast_if.py

@@ -1,5 +1,5 @@
 import ast
-from typing import Any, Optional
+from typing import Any
 
 from flake8_simplify.constants import AST_CONST_TYPES, BOOL_CONST_TYPES
 from flake8_simplify.utils import (
@@ -243,9 +243,9 @@ def get_sim116(node: ast.If) -> list[tuple[int, int, str]]:
     ):
         return errors
     variable = node.test.left
-    child: Optional[ast.If] = node.orelse[0]
+    child: ast.If | None = node.orelse[0]
     assert isinstance(child, ast.If), "hint for mypy"
-    else_value: Optional[str] = None
+    else_value: str | None = None
     key_value_pairs: dict[Any, Any]
     if isinstance(node.test.comparators[0], ast.Constant) and isinstance(
         node.test.comparators[0].value, str

{flake8_simplify-0.30.0 → flake8_simplify-0.31.0}/flake8_simplify/utils.py

@@ -1,7 +1,6 @@
 import ast
 import itertools
 from collections import defaultdict
-from typing import DefaultDict, Union
 
 
 # The following types were created to help mypy understand that there is a
@@ -81,7 +80,7 @@ class Assign(ast.Assign):
 
 
 def to_source(
-    node: Union[None, ast.expr, ast.Expr, ast.withitem, ast.slice, ast.Assign],
+    node: None | ast.expr | ast.Expr | ast.withitem | ast.slice | ast.Assign,
 ) -> str:
     if node is None:
         return "None"
@@ -118,7 +117,7 @@ def is_body_same(body1: list[ast.stmt], body2: list[ast.stmt]) -> bool:
     """Check if two lists of expressions are equivalent."""
     if len(body1) != len(body2):
         return False
-    for a, b in zip(body1, body2):
+    for a, b in zip(body1, body2, strict=True):
         try:
             stmt_equal = is_stmt_equal(a, b)
         except RecursionError:  # maximum recursion depth
@@ -150,7 +149,7 @@ def is_stmt_equal(a: ast.stmt, b: ast.stmt) -> bool:
     elif isinstance(a, list):
         if len(a) != len(b):
             return False
-        return all(itertools.starmap(is_stmt_equal, zip(a, b)))
+        return all(itertools.starmap(is_stmt_equal, zip(a, b, strict=True)))
     else:
         return a == b
 
@@ -215,7 +214,7 @@ def _get_duplicated_isinstance_call_by_node(node: ast.BoolOp) -> list[str]:
     >> g("isinstance(a, int) or isinstance(b, float) or isinstance(b, int)
     ['b']
     """
-    counter: DefaultDict[str, int] = defaultdict(int)
+    counter: defaultdict[str, int] = defaultdict(int)
 
     for call in node.values:
         # Make sure that this function call is actually a call of the built-in

flake8_simplify-0.31.0/pyproject.toml

@@ -0,0 +1,115 @@
+[build-system]
+build-backend = "uv_build"
+requires = ["uv_build>=0.9,<0.13"]
+
+[project]
+name = "flake8_simplify"
+version = "0.31.0"
+description = "flake8 plugin which checks for code that can be simplified"
+keywords = ["flake8"]
+license = "MIT"
+license-files = ["LICENSE"]
+requires-python = ">=3.10"
+dependencies = ["flake8>=3.7"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "Natural Language :: English",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Software Development",
+    "Framework :: Flake8",
+]
+
+[[project.maintainers]]
+name = "Martin Thoma"
+email = "info@martin-thoma.de"
+
+[[project.authors]]
+name = "Martin Thoma"
+email = "info@martin-thoma.de"
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.entry-points."flake8.extension"]
+SIM = "flake8_simplify:Plugin"
+
+[project.urls]
+Homepage = "https://github.com/MartinThoma/flake8-simplify"
+
+[dependency-groups]
+dev = [
+    "mypy",
+    "pytest",
+    "pytest-cov",
+    "pytest-timeout",
+    "ruff",
+]
+mutation = ["mutmut>=3"]
+
+[tool.uv.build-backend]
+module-name = "flake8_simplify"
+module-root = ""
+
+[tool.mutmut]
+paths_to_mutate = ["flake8_simplify/"]
+tests_dir = ["tests/"]
+
+[tool.mypy]
+exclude = "build/lib/flake8_simplify.py"
+ignore_missing_imports = true
+strict = true
+check_untyped_defs = true
+disallow_any_generics = true
+disallow_incomplete_defs = true
+disallow_untyped_defs = true
+no_implicit_optional = true
+warn_unused_ignores = false
+show_error_codes = true
+
+[[tool.mypy.overrides]]
+disallow_untyped_defs = false
+module = [
+    "testing.*",
+    "tests.*",
+]
+
+[tool.pytest.ini_options]
+addopts = "--doctest-modules --cov=. --cov-report html:tests/reports/coverage-html --cov-report term-missing --ignore=docs/ --ignore=mutants/ --durations=3 --timeout=30"
+doctest_encoding = "utf-8"
+
+[tool.ruff]
+line-length = 79
+target-version = "py310"
+
+[tool.ruff.lint]
+select = [
+    "A",
+    "B",
+    "C4",
+    "E",
+    "ERA",
+    "F",
+    "I",
+    "ISC",
+    "PT",
+    "RSE",
+    "UP",
+]
+ignore = [
+    "PT007",
+    "ISC004",
+]
+
+[tool.ruff.lint.isort]
+known-first-party = ["flake8_simplify"]
+combine-as-imports = true

flake8_simplify-0.30.0/pyproject.toml → flake8_simplify-0.31.0/pyproject.toml.orig

@@ -1,20 +1,21 @@
 [build-system]
-build-backend = "setuptools.build_meta"
+build-backend = "uv_build"
 requires = [
-  "setuptools>=61.2",
+  "uv_build>=0.9,<0.13",
 ]
 
 [project]
 name = "flake8_simplify"
-version = "0.30.0"
+version = "0.31.0"
 description = "flake8 plugin which checks for code that can be simplified"
 keywords = [
   "flake8",
 ]
-license = {text = "MIT"}
+license = "MIT"
+license-files = ["LICENSE"]
 maintainers = [{name = "Martin Thoma", email = "info@martin-thoma.de"}]
 authors = [{name = "Martin Thoma", email = "info@martin-thoma.de"}]
-requires-python = ">=3.9.0"
+requires-python = ">=3.10"
 dependencies = [
   "flake8>=3.7",
 ]
@@ -22,16 +23,15 @@ classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Console",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development",
     "Framework :: Flake8",
 ]
@@ -46,23 +46,25 @@ content-type = "text/markdown"
 [project.urls]
 Homepage = "https://github.com/MartinThoma/flake8-simplify"
 
-[tool.setuptools]
-license-files = ["LICENSE"]
-include-package-data = false
-
-[tool.setuptools.packages.find]
-exclude = ["tests"]
-namespaces = false
+[dependency-groups]
+dev = [
+  "mypy",
+  "pytest",
+  "pytest-cov",
+  "pytest-timeout",
+  "ruff",
+]
+mutation = [
+  "mutmut>=3",
+]
 
-[tool.black]
-line-length = 79
-target-version = ['py39']
+[tool.uv.build-backend]
+module-name = "flake8_simplify"
+module-root = ""
 
 [tool.mutmut]
-backup = "False"
-runner = "./mutmut-test.sh"
-tests_dir = "tests/"
-paths_to_mutate = "flake8_simplify.py"
+paths_to_mutate = ["flake8_simplify/"]
+tests_dir = ["tests/"]
 
 [tool.mypy]
 exclude = "build/lib/flake8_simplify.py"
@@ -84,14 +86,16 @@ module = [
 ]
 
 [tool.pytest.ini_options]
-addopts = "--doctest-modules --cov=. --cov-report html:tests/reports/coverage-html --cov-report term-missing --ignore=docs/ --durations=3 --timeout=30"
+addopts = "--doctest-modules --cov=. --cov-report html:tests/reports/coverage-html --cov-report term-missing --ignore=docs/ --ignore=mutants/ --durations=3 --timeout=30"
 doctest_encoding = "utf-8"
 
 [tool.ruff]
 line-length = 79
+target-version = "py310"
 
 [tool.ruff.lint]
-select = ["E", "F", "I"]
+select = ["A", "B", "C4", "E", "ERA", "F", "I", "ISC", "PT", "RSE", "UP"]
+ignore = ["PT007", "ISC004"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["flake8_simplify"]

flake8_simplify-0.30.0/.coveragerc

@@ -1,22 +0,0 @@
-[run]
-branch = True
-omit = setup.py,tests/*
-
-[report]
-# Regexes for lines to exclude from consideration
-exclude_lines =
-    # Have to re-enable the standard pragma
-    pragma: no cover
-
-    # Don't complain about missing debug-only code:
-    def __repr__
-    def __str__
-    if self\.debug
-
-    # Don't complain if tests don't hit defensive assertion code:
-    raise AssertionError
-    raise NotImplementedError
-
-    # Don't complain if non-runnable code isn't run:
-    if 0:
-    if __name__ == .__main__.:

flake8_simplify-0.30.0/.flake8

@@ -1,6 +0,0 @@
-[flake8]
-ignore = E203, W503, PT007
-exclude = build/*
-per-file-ignores =
-    tests/*: ASS001
-max-line-length = 88

flake8_simplify-0.30.0/.github/ISSUE_TEMPLATE/adjust-rule.md

@@ -1,25 +0,0 @@
----
-name: Adjust rule
-about: Ask for an adjustment of an existing rule
-title: "[Adjust Rule]"
-labels: enhancement
-assignees: MartinThoma
-
----
-
-## Desired change
-
-* **Rule(s)**: SIM986, SIM987
-* **Adjustment**: In which way should it/they be adjusted?
-
-## Explanation
-
-Why is the adjustment necessary / better?
-
-## Example
-
-This is an example where the mentioned rule(s) would currently be suboptimal:
-
-```python
-# Your code goes here
-```

flake8_simplify-0.30.0/.github/ISSUE_TEMPLATE/rule-request.md

@@ -1,22 +0,0 @@
----
-name: Rule request
-about: Suggest a new rule to add to flake8-simplify
-title: "[New Rule]"
-labels: enhancement
-assignees: MartinThoma
-
----
-
-## Explanation
-
-Explain briefly why you think this makes the code simpler.
-
-## Example
-
-```python
-# Bad
-...  # your bad code goes here
-
-# Good
-...  # your improved code goes here
-```

flake8_simplify-0.30.0/.github/dependabot.yml

@@ -1,9 +0,0 @@
-# Set update schedule for GitHub Actions
-
-version: 2
-updates:
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"

flake8_simplify-0.30.0/.github/workflows/lint.yml

@@ -1,36 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Lint
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.9]
-
-    steps:
-    - uses: actions/checkout@v6
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements/lint.txt
-        pip install .
-    - name: Test with mypy
-      run: |
-        mypy flake8_simplify
-    - name: Test with flake8
-      run: |
-        flake8 .

flake8_simplify-0.30.0/.github/workflows/unit-test.yml

@@ -1,34 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Unit Tests
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.9, "3.10", 3.11, 3.12, 3.13]
-
-    steps:
-    - uses: actions/checkout@v6
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
-      with:
-        python-version: ${{ matrix.python-version }}
-        allow-prereleases: true
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements/dev.txt
-        pip install .
-    - name: Test with pytest
-      run: |
-        pytest -vv

flake8_simplify-0.30.0/.gitignore

@@ -1,142 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# mutmut
-.mutmut-cache
-mutmut-results.xml
-mutmut-results.html
-tests/reports/
-
-.vscode/
-*.code-workspace
-
-html/
-
-.envrc