auto-walrus 0.2.2__tar.gz → 0.3.1__tar.gz

auto_walrus-0.3.1/.github/workflows/publish_to_pypi.yml

@@ -0,0 +1,93 @@
+name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI
+
+on: push
+
+jobs:
+  build:
+    name: Build distribution 📦
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
+      - name: Install pypa/build
+        run: >-
+          python3 -m
+          pip install
+          build
+          --user
+      - name: Build a binary wheel and a source tarball
+        run: python3 -m build
+      - name: Store the distribution packages
+        uses: actions/upload-artifact@v3
+        with:
+          name: python-package-distributions
+          path: dist/
+
+  publish-to-pypi:
+    name: >-
+      Publish Python 🐍 distribution 📦 to PyPI
+    if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/auto-walrus # Replace <package-name> with your PyPI project name
+    permissions:
+      id-token: write # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v3
+        with:
+          name: python-package-distributions
+          path: dist/
+      - name: Publish distribution 📦 to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+  github-release:
+    name: >-
+      Sign the Python 🐍 distribution 📦 with Sigstore
+      and upload them to GitHub Release
+    needs:
+      - publish-to-pypi
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write # IMPORTANT: mandatory for making GitHub Releases
+      id-token: write # IMPORTANT: mandatory for sigstore
+
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v3
+        with:
+          name: python-package-distributions
+          path: dist/
+      - name: Sign the dists with Sigstore
+        uses: sigstore/gh-action-sigstore-python@v1.2.3
+        with:
+          inputs: >-
+            ./dist/*.tar.gz
+            ./dist/*.whl
+      - name: Create GitHub Release
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: >-
+          gh release create
+          '${{ github.ref_name }}'
+          --repo '${{ github.repository }}'
+          --notes ""
+      - name: Upload artifact signatures to GitHub Release
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        # Upload to GitHub Release using the `gh` CLI.
+        # `dist/` contains the built packages, and the
+        # sigstore-produced signatures and certificates.
+        run: >-
+          gh release upload
+          '${{ github.ref_name }}' dist/**
+          --repo '${{ github.repository }}'

auto_walrus-0.3.1/.github/workflows/tox.yml

@@ -0,0 +1,32 @@
+name: tox
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  tox:
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        os: [windows-latest, ubuntu-latest]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Cache multiple paths
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/pip
+            $RUNNER_TOOL_CACHE/Python/*
+            ~\AppData\Local\pip\Cache
+          key: ${{ runner.os }}-build-${{ matrix.python-version }}
+      - name: install-tox
+        run: python -m pip install --upgrade tox virtualenv setuptools pip
+      - name: run-tox
+        run: tox -e py

auto_walrus-0.3.1/.gitignore

@@ -0,0 +1,9 @@
+.coverage
+venv
+*.pyc
+.tox
+coverage.xml
+*.egg-info/
+build/
+dist/
+todo

auto_walrus-0.3.1/.pre-commit-config.yaml

@@ -0,0 +1,23 @@
+repos:
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: 'v0.3.5'
+  hooks:
+    # Run the formatter.
+    - id: ruff-format
+    # Run the linter.
+    - id: ruff
+      args: [--fix]
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: 'v1.9.0'
+  hooks:
+    - id: mypy
+      additional_dependencies: [pytest]
+      exclude: utils
+- repo: https://github.com/codespell-project/codespell
+  rev: 'v2.2.6'
+  hooks:
+    - id: codespell
+      files: \.(py|rst|md)$
+      args: [--ignore-words-list=ser]
+

auto_walrus-0.3.1/.pre-commit-hooks.yaml

@@ -0,0 +1,6 @@
+-   id: auto-walrus
+    name: auto-walrus
+    description: Automatically use the walrus operator!
+    entry: auto-walrus
+    language: python
+    types: [python]

{auto_walrus-0.2.2/auto_walrus.egg-info → auto_walrus-0.3.1}/PKG-INFO

@@ -1,18 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: auto-walrus
-Version: 0.2.2
+Version: 0.3.1
 Summary: Automatically apply the awesome walrus operator
-Home-page: https://github.com/MarcoGorelli/auto-walrus
-Author: Marco Gorelli
-License: MIT
+Project-URL: Homepage, https://github.com/MarcoGorelli/auto-walrus
+Project-URL: Bug Tracker, https://github.com/MarcoGorelli/auto-walrus
+Author-email: Marco Gorelli <33491632+MarcoGorelli@users.noreply.github.com>
+License-File: LICENSE
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
 
 <h1 align="center">
 auto-walrus
@@ -83,6 +81,7 @@ To my great surprise, this is being used by:
 - https://github.com/python-graphblas/python-graphblas
 - https://github.com/Remi-Gau/bids2cite
 - https://github.com/TheAlgorithms/Python
+- https://github.com/apache/superset
 
 Anyone else? Please let me know, or you can open a pull request to add yourself.
 

{auto_walrus-0.2.2 → auto_walrus-0.3.1}/README.md

@@ -67,6 +67,7 @@ To my great surprise, this is being used by:
 - https://github.com/python-graphblas/python-graphblas
 - https://github.com/Remi-Gau/bids2cite
 - https://github.com/TheAlgorithms/Python
+- https://github.com/apache/superset
 
 Anyone else? Please let me know, or you can open a pull request to add yourself.
 

{auto_walrus-0.2.2 → auto_walrus-0.3.1}/auto_walrus.py

@@ -2,17 +2,32 @@ from __future__ import annotations
 
 import argparse
 import ast
+import os
+import pathlib
 import re
 import sys
+from typing import Any
 from typing import Iterable
 from typing import Sequence
 from typing import Tuple
 
-SEP_SYMBOLS = frozenset(('(', ')', ',', ':'))
+if sys.version_info >= (3, 11):  # pragma: no cover
+    import tomllib
+else:  # pragma: no cover
+    import tomli as tomllib
+
+SEP_SYMBOLS = frozenset(("(", ")", ",", ":"))
 # name, lineno, col_offset, end_lineno, end_col_offset
 Token = Tuple[str, int, int, int, int]
 SIMPLE_NODE = (ast.Name, ast.Constant)
-ENDS_WITH_COMMENT = re.compile(r'#.*$')
+ENDS_WITH_COMMENT = re.compile(r"#.*$")
+EXCLUDES = (
+    r"/("
+    r"\.direnv|\.eggs|\.git|\.hg|\.ipynb_checkpoints|\.mypy_cache|\.nox|\.svn|"
+    r"\.tox|\.venv|"
+    r"_build|buck-out|build|dist|venv"
+    r")/"
+)
 
 
 def name_lineno_coloffset_iterable(
@@ -26,18 +41,10 @@ def name_lineno_coloffset(tokens: Token) -> tuple[str, int, int]:
 
 
 def is_simple_test(node: ast.AST) -> bool:
-    return (
-        isinstance(node, SIMPLE_NODE)
-        or (
-            isinstance(node, ast.Compare)
-            and isinstance(node.left, SIMPLE_NODE)
-            and (
-                all(
-                    isinstance(_node, SIMPLE_NODE)
-                    for _node in node.comparators
-                )
-            )
-        )
+    return isinstance(node, SIMPLE_NODE) or (
+        isinstance(node, ast.Compare)
+        and isinstance(node.left, SIMPLE_NODE)
+        and (all(isinstance(_node, SIMPLE_NODE) for _node in node.comparators))
     )
 
 
@@ -75,7 +82,9 @@ def find_names(
         if isinstance(_node, ast.Name):
             names.add(
                 record_name_lineno_coloffset(
-                    _node, end_lineno, end_col_offset,
+                    _node,
+                    end_lineno,
+                    end_col_offset,
                 ),
             )
     return names
@@ -97,14 +106,13 @@ def process_assign(
     assignments: set[Token],
     related_vars: dict[str, list[Token]],
 ) -> None:
-    if (
-        len(node.targets) == 1
-        and isinstance(node.targets[0], ast.Name)
-    ):
+    if len(node.targets) == 1 and isinstance(node.targets[0], ast.Name):
         target = node.targets[0]
         assignments.add(
             record_name_lineno_coloffset(
-                target, node.end_lineno, node.end_col_offset,
+                target,
+                node.end_lineno,
+                node.end_col_offset,
             ),
         )
         related_vars[target.id] = list(find_names(node.value))
@@ -123,36 +131,38 @@ def is_walrussable(
 ) -> bool:
     return (
         # check name doesn't appear between assignment and if statement
-        _assignment[0] not in [
-            sorted_names[i][0]
-            for i in range(assignment_idx+1, if_statement_idx)
-        ]
+        _assignment[0]
+        not in [sorted_names[i][0] for i in range(assignment_idx + 1, if_statement_idx)]
         # check it's the variable's only assignment
         and (len(_other_assignments) == 1)
         # check this is the first usage of this name
         and (
             name_lineno_coloffset(
                 _other_usages[0],
-            ) == name_lineno_coloffset(_assignment)
+            )
+            == name_lineno_coloffset(_assignment)
         )
         # check it's used at least somewhere else
         and (len(_other_usages) > 2)
         # check it doesn't appear anywhere else
         and not [
-            i for i in names
+            i
+            for i in names
             if (
-                name_lineno_coloffset(i) not in
-                name_lineno_coloffset_iterable(in_body_vars[_if_statement])
+                name_lineno_coloffset(i)
+                not in name_lineno_coloffset_iterable(in_body_vars[_if_statement])
             )
             and (
                 name_lineno_coloffset(
                     i,
-                ) != name_lineno_coloffset(_assignment)
+                )
+                != name_lineno_coloffset(_assignment)
             )
             and (
                 name_lineno_coloffset(
                     i,
-                ) != name_lineno_coloffset(_if_statement)
+                )
+                != name_lineno_coloffset(_if_statement)
             )
             and i[0] == _assignment[0]
         ]
@@ -171,10 +181,7 @@ def related_vars_are_unused(
     related = related_vars[name]
     should_break = False
     for rel in related:
-        usages = [
-            i for i in sorted_names if i[0]
-            == rel[0] if i != rel
-        ]
+        usages = [i for i in sorted_names if i[0] == rel[0] if i != rel]
         for usage in usages:
             rel_used_idx = name_lineno_coloffset_iterable(
                 sorted_names,
@@ -186,7 +193,6 @@ def related_vars_are_unused(
 
 def visit_function_def(
     node: ast.FunctionDef,
-    path: str,
 ) -> list[tuple[Token, Token]]:
     names = set()
     assignments: set[Token] = set()
@@ -224,13 +230,8 @@ def visit_function_def(
         if_statement_idx = name_lineno_coloffset_iterable(
             sorted_names,
         ).index(name_lineno_coloffset(_if_statement))
-        _other_assignments = [
-            i
-            for i in sorted_assignments if i[0] == _assignment[0]
-        ]
-        _other_usages = [
-            i for i in sorted_names if i[0] == _assignment[0]
-        ]
+        _other_assignments = [i for i in sorted_assignments if i[0] == _assignment[0]]
+        _other_usages = [i for i in sorted_names if i[0] == _assignment[0]]
         if is_walrussable(
             _assignment,
             _if_statement,
@@ -241,19 +242,21 @@ def visit_function_def(
             _other_usages,
             names,
             in_body_vars,
+        ) and related_vars_are_unused(
+            related_vars,
+            _assignment[0],
+            sorted_names,
+            assignment_idx,
+            if_statement_idx,
         ):
-            if related_vars_are_unused(
-                related_vars,
-                _assignment[0],
-                sorted_names,
-                assignment_idx,
-                if_statement_idx,
-            ):
-                walrus.append((_assignment, _if_statement))
+            walrus.append((_assignment, _if_statement))
     return walrus
 
 
-def auto_walrus(content: str, path: str, line_length: int) -> str | None:
+def auto_walrus(
+    content: str,
+    line_length: int,
+) -> str | None:
     lines = content.splitlines()
     try:
         tree = ast.parse(content)
@@ -263,7 +266,7 @@ def auto_walrus(content: str, path: str, line_length: int) -> str | None:
     walruses = []
     for node in ast.walk(tree):
         if isinstance(node, ast.FunctionDef):
-            walruses.extend(visit_function_def(node, path))
+            walruses.extend(visit_function_def(node))
     lines_to_remove = []
     walruses = sorted(walruses, key=lambda x: (-x[1][1], -x[1][2]))
 
@@ -273,75 +276,133 @@ def auto_walrus(content: str, path: str, line_length: int) -> str | None:
     for _assignment, _if_statement in walruses:
         if _assignment[1] != _assignment[3]:
             continue
-        txt = lines[_assignment[1]-1][_assignment[2]:_assignment[4]]
-        if txt.count('=') > 1:
+        txt = lines[_assignment[1] - 1][_assignment[2] : _assignment[4]]
+        if txt.count("=") > 1:
             continue
-        line = lines[_if_statement[1]-1]
-        left_bit = line[:_if_statement[2]]
-        right_bit = line[_if_statement[4]:]
+        line = lines[_if_statement[1] - 1]
+        left_bit = line[: _if_statement[2]]
+        right_bit = line[_if_statement[4] :]
         no_paren = any(left_bit.endswith(i) for i in SEP_SYMBOLS) and any(
             right_bit.startswith(i) for i in SEP_SYMBOLS
         )
-        replace = txt.replace('=', ':=')
+        replace = txt.replace("=", ":=")
         if no_paren:
             line_with_walrus = left_bit + replace + right_bit
         else:
-            line_with_walrus = left_bit + '(' + replace + ')' + right_bit
+            line_with_walrus = left_bit + "(" + replace + ")" + right_bit
         if len(line_with_walrus) > line_length:
             # don't rewrite if it would split over multiple lines
             continue
         # replace assignment
         line_without_assignment = (
-            f'{lines[_assignment[1]-1][:_assignment[2]]}'
-            f'{lines[_assignment[1]-1][_assignment[4]:]}'
+            f"{lines[_assignment[1]-1][:_assignment[2]]}"
+            f"{lines[_assignment[1]-1][_assignment[4]:]}"
         )
-        if (
-            ENDS_WITH_COMMENT.search(lines[_assignment[1]-1]) is not None
-        ) or (
-            ENDS_WITH_COMMENT.search(lines[_if_statement[1]-1]) is not None
+        if (ENDS_WITH_COMMENT.search(lines[_assignment[1] - 1]) is not None) or (
+            ENDS_WITH_COMMENT.search(lines[_if_statement[1] - 1]) is not None
         ):
             continue
         lines[_assignment[1] - 1] = line_without_assignment
         # add walrus
-        lines[_if_statement[1]-1] = line_with_walrus
+        lines[_if_statement[1] - 1] = line_with_walrus
         # remove empty line
-        if not lines[_assignment[1]-1].strip():
-            lines_to_remove.append(_assignment[1]-1)
+        if not lines[_assignment[1] - 1].strip():
+            lines_to_remove.append(_assignment[1] - 1)
 
     newlines = [
-        line for i, line in enumerate(
+        line
+        for i, line in enumerate(
             lines,
-        ) if i not in lines_to_remove
+        )
+        if i not in lines_to_remove
     ]
-    newcontent = '\n'.join(newlines)
-    if newcontent and content.endswith('\n'):
-        newcontent += '\n'
+    newcontent = "\n".join(newlines)
+    if newcontent and content.endswith("\n"):
+        newcontent += "\n"
     if newcontent != content:
         return newcontent
     return None
 
 
+def _get_config(paths: list[pathlib.Path]) -> dict[str, Any]:
+    """Get the configuration from a config file.
+
+    Search for a pyproject.toml in common parent directories
+    of the given list of paths.
+    """
+    root = pathlib.Path(os.path.commonpath(paths))
+    root = root.parent if root.is_file() else root
+
+    while root != root.parent:
+        config_file = root / "pyproject.toml"
+        if config_file.is_file():
+            config = tomllib.loads(config_file.read_text())
+            config = config.get("tool", {}).get("auto-walrus", {})
+            if config:
+                return config
+
+        root = root.parent
+
+    return {}
+
+
 def main(argv: Sequence[str] | None = None) -> int:  # pragma: no cover
     parser = argparse.ArgumentParser()
-    parser.add_argument('paths', nargs='*')
+    parser.add_argument("paths", nargs="*")
+    parser.add_argument(
+        "--files",
+        help="Regex pattern with which to match files to include",
+        required=False,
+        default=r"",
+    )
+    parser.add_argument(
+        "--exclude",
+        help="Regex pattern with which to match files to exclude",
+        required=False,
+        default=r"^$",
+    )
     # black formatter's default
-    parser.add_argument('--line-length', type=int, default=88)
+    parser.add_argument("--line-length", type=int, default=88)
     args = parser.parse_args(argv)
+    paths = [pathlib.Path(path).resolve() for path in args.paths]
+
+    # Update defaults from pyproject.toml if present
+    config = {k.replace("-", "_"): v for k, v in _get_config(paths).items()}
+    parser.set_defaults(**config)
+    args = parser.parse_args(argv)
+
     ret = 0
-    for path in args.paths:
-        try:
-            with open(path, encoding='utf-8') as fd:
-                content = fd.read()
-        except UnicodeDecodeError:
-            continue
-        new_content = auto_walrus(content, path, line_length=args.line_length)
-        if new_content is not None and content != new_content:
-            sys.stdout.write(f'Rewriting {path}\n')
-            with open(path, 'w', encoding='utf-8') as fd:
-                fd.write(new_content)
-            ret = 1
+
+    for path in paths:
+        if path.is_file():
+            filepaths = iter((path,))
+        else:
+            filepaths = (
+                p
+                for p in path.rglob("*")
+                if re.search(args.files, p.as_posix(), re.VERBOSE)
+                and not re.search(args.exclude, p.as_posix(), re.VERBOSE)
+                and not re.search(EXCLUDES, p.as_posix())
+                and p.suffix == ".py"
+            )
+
+        for filepath in filepaths:
+            try:
+                with open(filepath, encoding="utf-8") as fd:
+                    content = fd.read()
+            except UnicodeDecodeError:
+                continue
+            new_content = auto_walrus(
+                content,
+                line_length=args.line_length,
+            )
+            if new_content is not None and content != new_content:
+                sys.stdout.write(f"Rewriting {filepath}\n")
+                with open(filepath, "w", encoding="utf-8") as fd:
+                    fd.write(new_content)
+                ret = 1
     return ret
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     sys.exit(main())

auto_walrus-0.3.1/pyproject.toml

@@ -0,0 +1,90 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "auto-walrus"
+version = "0.3.1"
+authors = [
+  { name="Marco Gorelli", email="33491632+MarcoGorelli@users.noreply.github.com" },
+]
+description = "Automatically apply the awesome walrus operator"
+readme = "README.md"
+requires-python = ">=3.8"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/MarcoGorelli/auto-walrus"
+"Bug Tracker" = "https://github.com/MarcoGorelli/auto-walrus"
+
+[tool.ruff]
+line-length = 90
+fix = true
+target-version = "py38"
+
+lint.select = [
+  "ALL",
+]
+lint.ignore = [
+  'A001',
+  'A003',
+  'ANN101',
+  'ANN401',
+  'ARG002',  # todo: enable
+  'ARG003',  # todo: enable
+  'C901',
+  'COM812',
+  'D',
+  'DTZ',
+  'E501',
+  'EM101',  # todo: enable
+  'ERA001',  # todo: enable
+  'FBT003',  # todo: enable
+  'FIX',
+  'ICN001',
+  'ISC001',
+  'PD',
+  'PLR0911',
+  'PLR0912',
+  'PLR5501',
+  'PLR2004',
+  'PT011',
+  'PTH',
+  'RET505',
+  'S',
+  'SLF001',
+  'TD',
+  'TRY003',  # todo: enable
+  'TRY004'
+]
+
+[tool.ruff.lint.isort]
+force-single-line = true
+
+[tool.black]
+line-length = 90
+
+[tool.pytest.ini_options]
+filterwarnings = [
+  "error",
+  'ignore:distutils Version classes are deprecated:DeprecationWarning',
+]
+xfail_strict = true
+markers = ["slow: marks tests as slow (deselect with '-m \"not slow\"')"]
+
+[tool.coverage.run]
+plugins = ["covdefaults"]
+
+[tool.coverage.report]
+exclude_also = [
+  "> POLARS_VERSION",
+  "if sys.version_info() <",
+]
+
+[tool.mypy]
+strict = true
+

auto_walrus-0.3.1/requirements-dev.txt

@@ -0,0 +1,4 @@
+covdefaults
+pytest
+pytest-cov
+pytest-randomly

auto_walrus-0.3.1/tests/main_test.py

@@ -0,0 +1,212 @@
+from __future__ import annotations
+
+import pathlib
+from typing import Any
+from typing import List
+from typing import Tuple
+
+import pytest
+
+from auto_walrus import auto_walrus
+from auto_walrus import main
+
+
+@pytest.mark.parametrize(
+    ("src", "expected"),
+    [
+        (
+            "def foo():\n" "    a = 0\n" "    if a:\n" "        print(a)\n",
+            "def foo():\n" "    if (a := 0):\n" "        print(a)\n",
+        ),
+        (
+            "def foo():\n" "    a = 0\n" "    if a > 3:\n" "        print(a)\n",
+            "def foo():\n" "    if (a := 0) > 3:\n" "        print(a)\n",
+        ),
+        (
+            "def foo():\n"
+            "    a = 0\n"
+            "    if a:\n"
+            "        print(a)\n"
+            "    else:\n"
+            "        pass\n",
+            "def foo():\n"
+            "    if (a := 0):\n"
+            "        print(a)\n"
+            "    else:\n"
+            "        pass\n",
+        ),
+        (
+            "def foo():\n"
+            "    a = 0\n"
+            "    if True:\n"
+            "        print(1)\n"
+            "    elif a:\n"
+            "        print(a)\n",
+            "def foo():\n"
+            "    if True:\n"
+            "        print(1)\n"
+            "    elif (a := 0):\n"
+            "        print(a)\n",
+        ),
+        (
+            "def foo():\n"
+            "    a = 0\n"
+            "    print(0)\n"
+            "    if a:\n"
+            "        print(a)\n",
+            "def foo():\n" "    print(0)\n" "    if (a := 0):\n" "        print(a)\n",
+        ),
+        (
+            "def foo():\n" "    a = 0\n" "    if (a):\n" "        print(a)\n",
+            "def foo():\n" "    if (a := 0):\n" "        print(a)\n",
+        ),
+        (
+            "def foo():\n" "    b = 0; a = 0\n" "    if a:\n" "        print(a)\n",
+            "def foo():\n" "    b = 0; \n" "    if (a := 0):\n" "        print(a)\n",
+        ),
+        (
+            "def foo():\n" "    a = 0\n" "    if a:\n" "        print(a)",
+            "def foo():\n" "    if (a := 0):\n" "        print(a)",
+        ),
+        (
+            "def foo():\n"
+            "    a = 0\n"
+            "    if a:\n"
+            "        print(a)\n"
+            "    if (b := 3) > 0:\n"
+            "        print(b)\n",
+            "def foo():\n"
+            "    if (a := 0):\n"
+            "        print(a)\n"
+            "    if (b := 3) > 0:\n"
+            "        print(b)\n",
+        ),
+        (
+            "def foo():\n"
+            "    a = 0\n"
+            "    if np.sin(b) + np.cos(b) < np.tan(b):\n"
+            "        pass\n"
+            "    elif a:\n"
+            "        print(a)\n",
+            "def foo():\n"
+            "    if np.sin(b) + np.cos(b) < np.tan(b):\n"
+            "        pass\n"
+            "    elif (a := 0):\n"
+            "        print(a)\n",
+        ),
+    ],
+)
+def test_rewrite(src: str, expected: str) -> None:
+    ret = auto_walrus(src, 88)
+    assert ret == expected
+
+
+@pytest.mark.parametrize(
+    "src",
+    [
+        "def foo():\n"
+        "    b = [0]\n"
+        "    a = b[0]\n"
+        "    b[0] = 1\n"
+        "    if a:\n"
+        "        print(a)\n",
+        "def foo():\n" "    a = 1\n" "    a = 2\n" "    if a:\n" "        print(a)\n",
+        "def foo():\n" "    a = (\n" "        0,)\n" "    if a:\n" "        print(a)\n",
+        "def foo():\n" "    a = (b==True)\n" "    if a:\n" "        print(a)\n",
+        "def foo():\n"
+        "    a = thequickbrownfoxjumpsoverthelazydog\n"
+        "    if a:\n"
+        "        print(a)\n",
+        "def foo():\n" "    a = 0  # no-walrus\n" "    if a:\n" "        print(a)\n",
+        "def foo():\n" "    a = 0\n" "    if a:  # no-walrus\n" "        print(a)\n",
+        "n = 10\n" "if foo(a := n+1):\n" "    print(n)\n",
+        "a = 0\n" "if False and a:\n" "    print(a)\n" "else:\n" "    print(a)\n",
+        "def foo():\n" "    a = 1\n" "    if a:\n" "        print(a)\n" "    a = 2\n",
+        "def foo():\n"
+        "    n = 10\n"
+        "    if True:\n"
+        "        pass\n"
+        "    elif foo(a := n+1):\n"
+        "        print(n)\n",
+        "def foo():\n"
+        "    n = 10\n"
+        "    if n > np.sin(foo.bar.quox):\n"
+        "        print(n)\n",
+        "def foo():\n" "    n = 10\n" "    if True or n > 3:\n" "        print(n)\n",
+    ],
+)
+def test_noop(src: str) -> None:
+    ret = auto_walrus(src, 40)
+    assert ret is None
+
+
+ProjectDirT = Tuple[pathlib.Path, List[pathlib.Path]]
+
+SRC_ORIG = "def foo():\n" "    a = 0\n" "    if a:\n" "        print(a)\n"
+SRC_CHANGED = "def foo():\n" "    if (a := 0):\n" "        print(a)\n"
+
+
+@pytest.fixture()
+def project_dir(request: Any, tmp_path: pathlib.Path) -> ProjectDirT:
+    # tmp_path will be the root of the project, e.g.:
+    # tmp_path
+    # ├── submodule1/
+    # |   ├── submodule2/
+    # |   |   └── a.py
+    # |   └── b.py
+    # ├── submodule3/
+    # |   └── c.py
+    # └── pyproject.toml
+
+    config_content = request.node.get_closest_marker("config_content")
+    if config_content:
+        (tmp_path / "pyproject.toml").write_text(config_content.args[0])
+
+    python_files = [
+        tmp_path / "submodule1" / "submodule2" / "a.py",
+        tmp_path / "submodule1" / "b.py",
+        tmp_path / "submodule3" / "c.py",
+    ]
+    for file_path in python_files:
+        file_path.parent.mkdir(parents=True, exist_ok=True)
+        file_path.write_text(SRC_ORIG)
+
+    return tmp_path, python_files
+
+
+PROJECT_CONFIG_EXCLUDE_A = "[tool.auto-walrus]\n" 'exclude = "/a"\n'
+
+
+@pytest.mark.config_content(PROJECT_CONFIG_EXCLUDE_A)
+def test_config_file_respected(project_dir: ProjectDirT) -> None:
+    project_root, files = project_dir
+    main([str(project_root)])
+    for file in files:
+        expected = SRC_ORIG if file.name == "a.py" else SRC_CHANGED
+        assert file.read_text() == expected, f"Unexpected result for {file}"
+
+
+@pytest.mark.config_content(PROJECT_CONFIG_EXCLUDE_A)
+def test_config_file_overridden_by_cmdline(
+    project_dir: ProjectDirT,
+) -> None:
+    project_root, files = project_dir
+    main(["--exclude", "/b", str(project_root)])
+    for file in files:
+        expected = SRC_ORIG if file.name == "b.py" else SRC_CHANGED
+        assert file.read_text() == expected, f"Unexpected result for {file}"
+
+
+@pytest.mark.config_content("\n")
+def test_config_file_no_auto_walrus(project_dir: ProjectDirT) -> None:
+    project_root, files = project_dir
+    main([str(project_root)])
+    for file in files:
+        assert file.read_text() == SRC_CHANGED, f"Unexpected result for {file}"
+
+
+def test_config_file_missing(project_dir: ProjectDirT) -> None:
+    project_root, files = project_dir
+    main([str(project_root)])
+    for file in files:
+        assert file.read_text() == SRC_CHANGED, f"Unexpected result for {file}"

auto_walrus-0.3.1/tox.ini

@@ -0,0 +1,11 @@
+[tox]
+envlist = py{38,39,310,311}
+
+[testenv]
+deps =
+    -rrequirements-dev.txt
+commands =
+    coverage erase
+    coverage run -m pytest {posargs:tests -vv -W error}
+    coverage xml
+    coverage report --show-missing

auto_walrus-0.3.1/utils/bump_version.py

@@ -0,0 +1,25 @@
+# mypy: ignore
+# ruff: noqa
+import re
+import subprocess
+import sys
+
+how = sys.argv[1]
+
+with open("pyproject.toml", encoding="utf-8") as f:
+    content = f.read()
+old_version = re.search(r'version = "(.*)"', content).group(1)
+version = old_version.split(".")
+if how == "patch":
+    version = ".".join(version[:-1] + [str(int(version[-1]) + 1)])
+elif how == "minor":
+    version = ".".join(version[:-2] + [str(int(version[-2]) + 1), "0"])
+elif how == "major":
+    version = ".".join([str(int(version[0]) + 1), "0", "0"])
+content = content.replace(f'version = "{old_version}"', f'version = "{version}"')
+with open("pyproject.toml", "w", encoding="utf-8") as f:
+    f.write(content)
+
+subprocess.run(["git", "commit", "-a", "-m", f"Bump version to {version}"])
+subprocess.run(["git", "tag", "-a", version, "-m", version])
+subprocess.run(["git", "push", "--follow-tags"])

auto_walrus-0.2.2/PKG-INFO

@@ -1,109 +0,0 @@
-Metadata-Version: 2.1
-Name: auto_walrus
-Version: 0.2.2
-Summary: Automatically apply the awesome walrus operator
-Home-page: https://github.com/MarcoGorelli/auto-walrus
-Author: Marco Gorelli
-License: MIT
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-<h1 align="center">
-auto-walrus
-</h1>
-
-<p align="center">
-<img width="458" alt="auto-walrus" src="https://user-images.githubusercontent.com/33491632/195613331-f7442140-09da-4376-90aa-2ac4aaa242fa.png">
-</p>
-
-auto-walrus
-===========
-[![Build Status](https://github.com/MarcoGorelli/auto-walrus/workflows/tox/badge.svg)](https://github.com/MarcoGorelli/auto-walrus/actions?workflow=tox)
-[![Coverage](https://codecov.io/gh/MarcoGorelli/auto-walrus/branch/main/graph/badge.svg)](https://codecov.io/gh/MarcoGorelli/auto-walrus)
-[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/MarcoGorelli/auto-walrus/main.svg)](https://results.pre-commit.ci/latest/github/MarcoGorelli/auto-walrus/main)
-
-
-A tool and pre-commit hook to automatically apply the awesome walrus operator.
-
-
-## Installation
-
-```console
-pip install auto-walrus
-```
-
-## Usage as a pre-commit hook
-
-See [pre-commit](https://github.com/pre-commit/pre-commit) for instructions
-
-Sample `.pre-commit-config.yaml`:
-
-```yaml
--   repo: https://github.com/MarcoGorelli/auto-walrus
-    rev: v0.2.2
-    hooks:
-    -   id: auto-walrus
-```
-
-## Command-line example
-
-```console
-auto-walrus myfile.py
-```
-
-```diff
--    n = 10
--    if n > 3:
-+    if (n := 10) > 3:
-         print(n)
-```
-
-## Configuration
-
-Using the walrus operator can result in longer lines. Lines longer than what you
-pass to ``--line-length`` won't be rewritten to use walrus operators.
-
-E.g.
-```
-auto-walrus myfile_1.py myfile_2.py --line-length 89
-```
-
-Lines with comments won't be rewritten.
-
-## Used by
-
-To my great surprise, this is being used by:
-
-- https://github.com/python-graphblas/python-graphblas
-- https://github.com/Remi-Gau/bids2cite
-- https://github.com/TheAlgorithms/Python
-
-Anyone else? Please let me know, or you can open a pull request to add yourself.
-
-## Testimonials
-
-**Christopher Redwine**, [Senior Software Engineer at TechnologyAdvice](https://github.com/chrisRedwine)
-
-> hmm, i dunno about this one chief
-
-**Michael Kennedy & Brian Okken**, [hosts of the Python Bytes podcast](https://pythonbytes.fm/):
-
-> I kind of like this being separate from other tools
-
-**Someone on Discord**
-
-> you're a monster
-
-**Will McGugan**, [CEO / Founder of http://Textualize.io](https://www.willmcgugan.com/):
-
-> Embrace the Walrus!
-
-## Credits
-
-Logo by [lion_space](https://www.fiverr.com/lion_space)

auto_walrus-0.2.2/auto_walrus.egg-info/SOURCES.txt

@@ -1,10 +0,0 @@
-LICENSE
-README.md
-auto_walrus.py
-setup.cfg
-setup.py
-auto_walrus.egg-info/PKG-INFO
-auto_walrus.egg-info/SOURCES.txt
-auto_walrus.egg-info/dependency_links.txt
-auto_walrus.egg-info/entry_points.txt
-auto_walrus.egg-info/top_level.txt

auto_walrus-0.2.2/auto_walrus.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

auto_walrus-0.2.2/auto_walrus.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-auto-walrus = auto_walrus:main

auto_walrus-0.2.2/auto_walrus.egg-info/top_level.txt

@@ -1 +0,0 @@
-auto_walrus

auto_walrus-0.2.2/setup.cfg

@@ -1,48 +0,0 @@
-[metadata]
-name = auto_walrus
-version = 0.2.2
-description = Automatically apply the awesome walrus operator
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/MarcoGorelli/auto-walrus
-author = Marco Gorelli
-license = MIT
-license_file = LICENSE
-classifiers = 
-	License :: OSI Approved :: MIT License
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3 :: Only
-	Programming Language :: Python :: Implementation :: CPython
-	Programming Language :: Python :: Implementation :: PyPy
-
-[options]
-py_modules = auto_walrus
-python_requires = >=3.8
-
-[options.entry_points]
-console_scripts = 
-	auto-walrus = auto_walrus:main
-
-[bdist_wheel]
-universal = True
-
-[coverage:run]
-plugins = covdefaults
-
-[mypy]
-check_untyped_defs = true
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_defs = true
-no_implicit_optional = true
-
-[mypy-testing.*]
-disallow_untyped_defs = false
-
-[mypy-tests.*]
-disallow_untyped_defs = false
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

auto_walrus-0.2.2/setup.py

@@ -1,2 +0,0 @@
-from setuptools import setup
-setup()