lapsed 2.7.0__tar.gz → 2.7.2__tar.gz

{lapsed-2.7.0 → lapsed-2.7.2}/.gitignore

@@ -163,6 +163,3 @@ cython_debug/
 #.idea/
 
 notes
-
-# Local scratch notes
-*.local.md

{lapsed-2.7.0 → lapsed-2.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lapsed
-Version: 2.7.0
+Version: 2.7.2
 Summary: Find and remove dead code.
 Project-URL: homepage, https://github.com/albertas/deadcode
 Project-URL: documentation, https://deadcode.readthedocs.io/
@@ -94,7 +94,7 @@ Create a `.pre-commit-config.yaml` file in the root of your project directory, i
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/albertas/deadcode
-    rev: 2.7.0
+    rev: 2.6.0
     hooks:
       - id: deadcode
 ```
@@ -227,12 +227,6 @@ code base is implemented in.
 - [ ] Investigate ways of extracting and backporting Python3.10+ `ast` implementation to lower Python versions.
 
 ## Release notes
-- v2.7.0:
-    - Treat `pytest_*` functions defined in `conftest.py` (e.g. `pytest_configure`,
-      `pytest_collection_modifyitems`, `pytest_addoption`) as pytest hooks, which pytest
-      calls automatically by name, and never report them as unused.
-    - Treat methods decorated with `@typing.override` (or `@typing_extensions.override`)
-      as used, since they are called via the base class they override, not by their own name.
 - v2.6.0:
     - Add `--ignore-class-attributes` option to not report unused attributes assigned directly
       in a class body (e.g. `THING = "blah"` inside `class Foo:`), since such attributes may

{lapsed-2.7.0 → lapsed-2.7.2}/README.md

@@ -66,7 +66,7 @@ Create a `.pre-commit-config.yaml` file in the root of your project directory, i
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/albertas/deadcode
-    rev: 2.7.0
+    rev: 2.6.0
     hooks:
       - id: deadcode
 ```
@@ -199,12 +199,6 @@ code base is implemented in.
 - [ ] Investigate ways of extracting and backporting Python3.10+ `ast` implementation to lower Python versions.
 
 ## Release notes
-- v2.7.0:
-    - Treat `pytest_*` functions defined in `conftest.py` (e.g. `pytest_configure`,
-      `pytest_collection_modifyitems`, `pytest_addoption`) as pytest hooks, which pytest
-      calls automatically by name, and never report them as unused.
-    - Treat methods decorated with `@typing.override` (or `@typing_extensions.override`)
-      as used, since they are called via the base class they override, not by their own name.
 - v2.6.0:
     - Add `--ignore-class-attributes` option to not report unused attributes assigned directly
       in a class body (e.g. `THING = "blah"` inside `class Foo:`), since such attributes may

{lapsed-2.7.0 → lapsed-2.7.2}/deadcode/actions/find_python_filenames.py

@@ -22,6 +22,11 @@ def find_python_filenames(args: Args) -> List[str]:
                 logger.info(f'Ignoring: {path}')
             continue
 
+        if tach_index.is_outside_source_roots(path):
+            if args.verbose:
+                logger.info(f'Ignoring (outside tach source roots): {path}')
+            continue
+
         if path.is_file() and path.suffix == '.py' and tach_index.is_unchecked(path):
             if args.verbose:
                 logger.info(f'Ignoring (unchecked tach module): {path}')

{lapsed-2.7.0 → lapsed-2.7.2}/deadcode/actions/parse_tach_config.py

@@ -28,6 +28,7 @@ class TachModule:
 @dataclass
 class TachConfig:
     source_roots: List[Path]
+    project_root: Optional[Path] = None
     modules: List[TachModule] = field(default_factory=list)
     interfaces: List[TachInterface] = field(default_factory=list)
 
@@ -38,6 +39,31 @@ class TachIndex:
     def __init__(self, configs: List[TachConfig]) -> None:
         self._configs = configs
 
+    def is_outside_source_roots(self, path: Path) -> bool:
+        """True if `path` belongs to a tach project (is its project root or nested under it)
+
+        but falls outside every one of that project's `source_roots`, and outside them for
+        every other tach project it might also belong to. Paths unrelated to any tach project
+        (e.g. an explicitly provided directory that lives elsewhere entirely) are unaffected.
+        """
+        path = path.resolve()
+
+        related_to_any_config = False
+        for config in self._configs:
+            if config.project_root is None:
+                continue
+            relation = _relation_to_project_root(path, config.project_root)
+            if relation == 'unrelated':
+                continue
+            related_to_any_config = True
+            if relation == 'ancestor':
+                # `path` is still above the project root, so it must be walked into to reach it.
+                return False
+            if any(_within_or_towards_source_root(path, source_root) for source_root in config.source_roots):
+                return False
+
+        return related_to_any_config
+
     def is_unchecked(self, file: Path) -> bool:
         for config in self._configs:
             module_path = _dotted_module_path(file, config.source_roots)
@@ -54,7 +80,7 @@ class TachIndex:
             if module_path is None:
                 continue
             for interface in config.interfaces:
-                adopts_interface = interface.from_patterns is None or _match_any_regex(
+                adopts_interface = interface.from_patterns is None or _match_any_dotted_glob(
                     interface.from_patterns, module_path
                 )
                 if adopts_interface and _match_any_regex(interface.expose, name):
@@ -77,11 +103,11 @@ def _parse_tach_toml(path: Path) -> TachConfig:
     with open(path, 'rb') as f:
         data = tomllib.load(f)
 
-    project_root = path.parent
+    project_root = path.parent.resolve()
     raw_source_roots = data.get('source_roots') or ['.']
     source_roots = [(project_root / root).resolve() for root in raw_source_roots]
 
-    config = TachConfig(source_roots=source_roots)
+    config = TachConfig(source_roots=source_roots, project_root=project_root)
     config.modules.extend(_extract_modules(data))
     config.interfaces.extend(_extract_interfaces(data))
 
@@ -180,6 +206,18 @@ def _dotted_module_path(file: Path, source_roots: List[Path]) -> Optional[str]:
     return '.'.join(parts) if parts else None
 
 
+def _relation_to_project_root(path: Path, project_root: Path) -> str:
+    if path == project_root or project_root in path.parents:
+        return 'inside'
+    if path in project_root.parents:
+        return 'ancestor'
+    return 'unrelated'
+
+
+def _within_or_towards_source_root(path: Path, source_root: Path) -> bool:
+    return path == source_root or source_root in path.parents or path in source_root.parents
+
+
 def _dotted_glob_to_regex(pattern: str) -> re.Pattern[str]:
     regex_segments = [
         '.*' if segment == '**' else re.escape(segment).replace(r'\*', '[^.]*') for segment in pattern.split('.')

{lapsed-2.7.0 → lapsed-2.7.2}/deadcode/visitor/dead_code_visitor.py

@@ -287,7 +287,7 @@ class DeadCodeVisitor(ast.NodeVisitor):
 
         self.scopes.add(code_item)
 
-        if ignored(first_lineno, type_=type_):
+        if ignored(last_node.lineno, type_=type_):
             self._log(f'Ignoring {type_} "{name}"')
         else:
             collection.append(code_item)

{lapsed-2.7.0 → lapsed-2.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lapsed"
-version = "2.7.0"
+version = "2.7.2"
 authors = [
     {name = "Albertas Gimbutas", email = "albertasgim@gmail.com"},
 ]