meson-python-sources-fixer 1.0__tar.gz → 1.1__tar.gz

{meson_python_sources_fixer-1.0 → meson_python_sources_fixer-1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meson-python-sources-fixer
-Version: 1.0
+Version: 1.1
 Summary: Linter to list all Python sources in meson.build
 Author-email: Omar Sandoval <osandov@osandov.com>
 License-Expression: MIT
@@ -27,7 +27,7 @@ To use it via [pre-commit](https://pre-commit.com/), add the following to your
 ```yaml
 repos:
 -   repo: https://github.com/osandov/meson-python-sources-fixer
-    rev: v1.0
+    rev: v1.1
     hooks:
     -   id: meson-python-sources-fixer
 ```

{meson_python_sources_fixer-1.0 → meson_python_sources_fixer-1.1}/README.md

@@ -11,7 +11,7 @@ To use it via [pre-commit](https://pre-commit.com/), add the following to your
 ```yaml
 repos:
 -   repo: https://github.com/osandov/meson-python-sources-fixer
-    rev: v1.0
+    rev: v1.1
     hooks:
     -   id: meson-python-sources-fixer
 ```

{meson_python_sources_fixer-1.0 → meson_python_sources_fixer-1.1}/meson_python_sources_fixer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meson-python-sources-fixer
-Version: 1.0
+Version: 1.1
 Summary: Linter to list all Python sources in meson.build
 Author-email: Omar Sandoval <osandov@osandov.com>
 License-Expression: MIT
@@ -27,7 +27,7 @@ To use it via [pre-commit](https://pre-commit.com/), add the following to your
 ```yaml
 repos:
 -   repo: https://github.com/osandov/meson-python-sources-fixer
-    rev: v1.0
+    rev: v1.1
     hooks:
     -   id: meson-python-sources-fixer
 ```

{meson_python_sources_fixer-1.0 → meson_python_sources_fixer-1.1}/meson_python_sources_fixer.py

@@ -5,6 +5,7 @@
 import argparse
 import ast
 import difflib
+import os
 from pathlib import Path
 import sys
 from typing import Dict, Iterable, Literal, Mapping, Optional, Set
@@ -35,7 +36,7 @@ def print_error(s: str, *, color: bool) -> None:
     if color:
         sys.stderr.write("\033[31merror:\033[m " + s + "\n")
     else:
-        print(s, file=sys.stderr)
+        print("error:", s, file=sys.stderr)
 
 
 def print_diff(
@@ -79,8 +80,8 @@ def print_diff(
             sys.stdout.write(line)
 
 
-STRING_PATTERN = r"'(?:\\.|[^'])*'"
-COMMENT_PATTERN = r"[#].*"
+STRING_PATTERN = r"'(?:\\.|[^'\\])*'"
+COMMENT_PATTERN = r"[#].*+"
 NON_NEWLINE_WHITESPACE = r"[^\S\n]*"
 WHITESPACE_OR_COMMENT_CAPTURE = r"(?:\s|(?&comment))*"
 WHITESPACE_OR_COMMENT_EOL_CAPTURE = r"[^\S\n]*(?&comment)?$"
@@ -120,9 +121,6 @@ def find_py_installation(contents: str) -> Optional[str]:
         PY_INSTALLATION_PATTERN, contents, flags=regex.MULTILINE | regex.VERBOSE
     )
     return match.group(1) if match else None
-    if not match:
-        raise LookupError("import('python').find_installation() not found")
-    return match.group(1)
 
 
 SUBDIR_PATTERN = rf"""
@@ -149,13 +147,14 @@ def find_subdirs(contents: str) -> Iterable[str]:
 
 
 def is_python_source(name: str) -> bool:
-    return name.endswith(".py") or name.endswith(".pyi") or name == "py.typed"
+    return name.endswith((".py", ".pyi")) or os.path.basename(name) == "py.typed"
 
 
 def find_package_sources(source_path: Path, install_path: Path) -> Dict[str, Set[str]]:
     sources = {}
     if (source_path / "__init__.py").exists():
-        for root, dirs, files in source_path.walk():
+        for root_str, dirs, files in os.walk(source_path):
+            root = Path(root_str)
             dirs[:] = [dir for dir in dirs if (root / dir / "__init__.py").exists()]
 
             relative = root.relative_to(source_path)
@@ -251,7 +250,7 @@ def fix_package_meson_build(
         contents,
         flags=regex.MULTILINE | regex.VERBOSE,
     ):
-        if match.group("unrecognized"):
+        if match.group("unrecognized") is not None:
             raise CannotFixError(
                 f"unrecognized {py_installation}.install_sources() syntax"
             )
@@ -266,7 +265,7 @@ def fix_package_meson_build(
                 raise CannotFixError(
                     f"unrecognized {py_installation}.install_sources() subdir syntax"
                 )
-            subdir = ast.literal_eval(subdir_arg)
+            subdir = str(Path(ast.literal_eval(subdir_arg)))
 
         if subdir in matches:
             raise CannotFixError(

{meson_python_sources_fixer-1.0 → meson_python_sources_fixer-1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "meson-python-sources-fixer"
-version = "1.0"
+version = "1.1"
 description = "Linter to list all Python sources in meson.build"
 readme = "README.md"
 license = "MIT"