killpy 1.0.0__tar.gz → 1.0.1__tar.gz

{killpy-1.0.0 → killpy-1.0.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: killpy
-Version: 1.0.0
+Version: 1.0.1
 Summary: Find and delete unused Python environments (.venv, conda, poetry, pipenv, pipx, pyenv, uv) and caches to free disk space — from a fast terminal UI or a single CLI command.
 Project-URL: Homepage, https://github.com/Tlaloc-Es/killpy
 Project-URL: Documentation, https://tlaloc-es.github.io/killpy/
 Project-URL: Repository, https://github.com/Tlaloc-Es/killpy
 Project-URL: Bug Tracker, https://github.com/Tlaloc-Es/killpy/issues
 Keywords: venv,virtualenv,conda,poetry,pipenv,pipx,pyenv,uv,cleanup,disk-space,cache,cli,tui,textual,developer-tools
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: Console :: Curses
 Classifier: Intended Audience :: Developers
@@ -603,7 +603,7 @@ ______________________________________________________________________
 
 ```yaml
 - repo: https://github.com/Tlaloc-Es/KillPy
-  rev: 1.0.0
+  rev: 1.0.1
   hooks:
     - id: killpy                  # remove __pycache__ on every commit
     - id: killpy-clean-caches     # also removes .mypy_cache, .pytest_cache, .ruff_cache
@@ -628,7 +628,7 @@ Typical minimal setup (safe for daily use):
 
 ```yaml
 - repo: https://github.com/Tlaloc-Es/KillPy
-  rev: 1.0.0
+  rev: 1.0.1
   hooks:
     - id: killpy
 ```

{killpy-1.0.0 → killpy-1.0.1}/README.md

@@ -574,7 +574,7 @@ ______________________________________________________________________
 
 ```yaml
 - repo: https://github.com/Tlaloc-Es/KillPy
-  rev: 1.0.0
+  rev: 1.0.1
   hooks:
     - id: killpy                  # remove __pycache__ on every commit
     - id: killpy-clean-caches     # also removes .mypy_cache, .pytest_cache, .ruff_cache
@@ -599,7 +599,7 @@ Typical minimal setup (safe for daily use):
 
 ```yaml
 - repo: https://github.com/Tlaloc-Es/KillPy
-  rev: 1.0.0
+  rev: 1.0.1
   hooks:
     - id: killpy
 ```

killpy-1.0.1/killpy/detectors/_shared_walk.py

@@ -0,0 +1,110 @@
+"""Single shared filesystem walk for the tree-walking detectors.
+
+``venv`` / ``cache`` / ``artifacts`` / ``tox`` each used to run their own
+``os.walk`` over the scan root, and ``get_total_size`` re-walked every
+environment they found — walking a large tree several times over.
+
+This module performs **one** traversal: each directory is classified as an
+environment *container* (a venv, a cache dir, a build artifact, or ``.tox``);
+a match is recorded, its size is summed once, and its subtree is pruned.
+Environment pruning is always applied — once a venv is found, nothing inside it
+is scanned again — which also collapses the cache/artifact double-counting that
+used to happen inside environments.
+
+Callers pass the set of detector names whose results they want (``active``).
+Pruning happens on every container regardless of ``active``, so asking for a
+subset yields exactly what running those detectors alone would.
+"""
+
+from __future__ import annotations
+
+import logging
+import os
+from datetime import datetime, timezone
+from pathlib import Path
+
+from killpy.detectors.base import VCS_PRUNE_DIRS
+from killpy.files import get_total_size
+from killpy.models import Environment
+
+logger = logging.getLogger(__name__)
+
+_CACHE_DIRS = frozenset({"__pycache__", ".mypy_cache", ".pytest_cache", ".ruff_cache"})
+_ARTIFACT_EXACT = frozenset({"dist", "build"})
+_ARTIFACT_SUFFIXES = (".egg-info", ".dist-info")
+
+#: Map every ``Environment.type`` the shared walk (and the cache global scan)
+#: can produce back to the detector that owns it — used to group results per
+#: detector for progress callbacks.
+TYPE_TO_DETECTOR: dict[str, str] = {
+    ".venv": "venv",
+    "pyvenv.cfg": "venv",
+    "__pycache__": "cache",
+    ".mypy_cache": "cache",
+    ".pytest_cache": "cache",
+    ".ruff_cache": "cache",
+    "pip-cache": "cache",
+    "uv-cache": "cache",
+    "artifacts": "artifacts",
+    "tox": "tox",
+}
+
+
+def _classify(basename: str, filenames: list[str]) -> tuple[str, str] | None:
+    """Return ``(detector_name, env_type)`` if the dir is a container, else ``None``."""
+    if basename == ".venv" or "pyvenv.cfg" in filenames:
+        return ("venv", ".venv" if basename == ".venv" else "pyvenv.cfg")
+    if basename in _CACHE_DIRS:
+        return ("cache", basename)
+    if basename in _ARTIFACT_EXACT or any(
+        basename.endswith(suffix) for suffix in _ARTIFACT_SUFFIXES
+    ):
+        return ("artifacts", "artifacts")
+    if basename == ".tox":
+        return ("tox", "tox")
+    return None
+
+
+def _make_env(path: Path, env_type: str) -> Environment | None:
+    """Build an :class:`Environment` for *path*, summing its size once."""
+    try:
+        stat = path.stat()
+        return Environment(
+            path=path,
+            name=str(path),
+            type=env_type,
+            last_modified=datetime.fromtimestamp(stat.st_mtime, tz=timezone.utc),
+            size_bytes=get_total_size(path),
+        )
+    except (FileNotFoundError, OSError) as exc:
+        logger.debug("Skipping %s: %s", path, exc)
+        return None
+
+
+def walk_environments(root: Path, active: set[str]) -> list[Environment]:
+    """Walk *root* once and return environments for the ``active`` detector set.
+
+    Each directory that matches a container type is reported (when its detector
+    is in *active*) and its subtree pruned; VCS and ``site-packages`` trees are
+    never descended into.
+    """
+    envs: list[Environment] = []
+    for current, dirnames, filenames in os.walk(root, topdown=True):
+        dirnames[:] = [d for d in dirnames if d not in VCS_PRUNE_DIRS]
+        current_path = Path(current)
+        if current_path != root:
+            match = _classify(current_path.name, filenames)
+            if match is not None:
+                detector_name, env_type = match
+                if detector_name in active:
+                    env = _make_env(current_path, env_type)
+                    if env is not None:
+                        envs.append(env)
+                dirnames[:] = []  # env-pruning: never descend into a container
+                continue
+        # A bare ``site-packages`` (e.g. a conda env, which has no pyvenv.cfg) is
+        # not a container but must not be scanned for caches/artifacts. ``.venv``
+        # IS a container — detected on entry — so it is deliberately not pruned
+        # here (that would stop us from ever reporting it).
+        dirnames[:] = [d for d in dirnames if d != "site-packages"]
+    return envs

{killpy-1.0.0 → killpy-1.0.1}/killpy/detectors/artifacts.py

@@ -42,6 +42,7 @@ class ArtifactsDetector(AbstractDetector):
 
     name = "artifacts"
     always_available = True  # pure filesystem walk
+    shared_walk = True  # tree scan served by killpy.detectors._shared_walk
 
     def detect(self, path: Path) -> list[Environment]:
         envs: list[Environment] = []

{killpy-1.0.0 → killpy-1.0.1}/killpy/detectors/base.py

@@ -62,6 +62,11 @@ class AbstractDetector(ABC):
     required_tool: ClassVar[str | None] = None
     #: ``True`` for detectors that always apply (pure filesystem walks).
     always_available: ClassVar[bool] = False
+    #: ``True`` when this detector's tree scan is served by the single shared
+    #: walk (``killpy.detectors._shared_walk``) instead of its own ``os.walk``.
+    #: The :class:`~killpy.scanner.Scanner` batches all such detectors into one
+    #: traversal; ``detect`` is kept for direct use and tests.
+    shared_walk: ClassVar[bool] = False
 
     @abstractmethod
     def detect(self, path: Path) -> list[Environment]:
@@ -78,6 +83,15 @@ class AbstractDetector(ABC):
             use it as the walk root.
         """
 
+    def scan_global(self, path: Path) -> list[Environment]:
+        """Environments found outside the shared tree walk (e.g. global caches).
+
+        Empty by default; :class:`~killpy.detectors.cache.CacheDetector` overrides
+        it to report the global pip/uv caches.  Called by the Scanner only for
+        detectors with ``shared_walk = True``.
+        """
+        return []
+
     def _candidate_dirs(self) -> tuple[Path, ...]:
         """Directories whose existence makes this detector applicable.
 

{killpy-1.0.0 → killpy-1.0.1}/killpy/detectors/cache.py

@@ -72,6 +72,7 @@ class CacheDetector(AbstractDetector):
 
     name = "cache"
     always_available = True  # pure filesystem walk
+    shared_walk = True  # local tree scan served by killpy.detectors._shared_walk
 
     def detect(self, path: Path) -> list[Environment]:
         envs: list[Environment] = []
@@ -79,6 +80,10 @@ class CacheDetector(AbstractDetector):
         envs.extend(self._scan_global(path))
         return envs
 
+    def scan_global(self, path: Path) -> list[Environment]:
+        """Global pip/uv caches — the part not covered by the shared tree walk."""
+        return self._scan_global(path)
+
     # ------------------------------------------------------------------ #
 
     def _scan_local(self, root: Path) -> list[Environment]:

{killpy-1.0.0 → killpy-1.0.1}/killpy/detectors/tox.py

@@ -19,6 +19,7 @@ class ToxDetector(AbstractDetector):
 
     name = "tox"
     always_available = True  # pure filesystem walk
+    shared_walk = True  # tree scan served by killpy.detectors._shared_walk
 
     def detect(self, path: Path) -> list[Environment]:
         envs: list[Environment] = []

{killpy-1.0.0 → killpy-1.0.1}/killpy/detectors/venv.py

@@ -57,6 +57,7 @@ class VenvDetector(AbstractDetector):
 
     name = "venv"
     always_available = True  # pure filesystem walk
+    shared_walk = True  # tree scan served by killpy.detectors._shared_walk
 
     def detect(self, path: Path) -> list[Environment]:
         # Inner dedup: the ".venv" scan and the pyvenv.cfg scan below can both

{killpy-1.0.0 → killpy-1.0.1}/killpy/scanner.py

@@ -22,6 +22,7 @@ from collections.abc import AsyncIterator, Callable
 from pathlib import Path
 
 from killpy.detectors import ALL_DETECTORS, AbstractDetector
+from killpy.detectors._shared_walk import TYPE_TO_DETECTOR, walk_environments
 from killpy.detectors.pyenv import _pyenv_root
 from killpy.models import Environment
 
@@ -85,24 +86,28 @@ class Scanner:
         seen: set[Path] = set()
         results: list[Environment] = []
 
-        for detector in self._detectors:
-            if not detector.can_handle():
-                logger.debug("Skipping %s (can_handle=False)", detector.name)
-                continue
+        applicable = [d for d in self._detectors if d.can_handle()]
+        shared = [d for d in applicable if d.shared_walk]
+        others = [d for d in applicable if not d.shared_walk]
+
+        # One traversal shared by every filesystem-walking detector.
+        for detector, found in self._shared_walk_groups(shared, path):
+            processed = self._process(found, seen)
+            results.extend(processed)
+            if on_progress is not None:
+                on_progress(detector, processed)
+
+        # The remaining detectors scan their own global directories.
+        for detector in others:
             try:
                 found = detector.detect(path)
             except Exception as exc:  # noqa: BLE001
                 logger.warning("Detector %s raised: %s", detector.name, exc)
                 found = []
-
-            deduped = self._deduplicate(found, seen)
-            deduped = self._apply_exclusions(deduped)
-            for env in deduped:
-                self._mark_system_critical(env)
-            results.extend(deduped)
-
+            processed = self._process(found, seen)
+            results.extend(processed)
             if on_progress is not None:
-                on_progress(detector, deduped)
+                on_progress(detector, processed)
 
         results.sort(key=lambda e: e.size_bytes, reverse=True)
         return results
@@ -123,28 +128,70 @@ class Scanner:
                     table.add_row(env)
         """
         applicable = [d for d in self._detectors if d.can_handle()]
+        shared = [d for d in applicable if d.shared_walk]
+        others = [d for d in applicable if not d.shared_walk]
         seen: set[Path] = set()
 
-        async def _run(detector: AbstractDetector):
+        async def _run_shared() -> list[tuple[AbstractDetector, list[Environment]]]:
             try:
-                return detector, await asyncio.to_thread(detector.detect, path)
+                return await asyncio.to_thread(self._shared_walk_groups, shared, path)
+            except Exception as exc:  # noqa: BLE001
+                logger.warning("Shared walk raised: %s", exc)
+                return [(d, []) for d in shared]
+
+        async def _run_one(
+            detector: AbstractDetector,
+        ) -> list[tuple[AbstractDetector, list[Environment]]]:
+            try:
+                return [(detector, await asyncio.to_thread(detector.detect, path))]
             except Exception as exc:  # noqa: BLE001
                 logger.warning("Detector %s raised: %s", detector.name, exc)
-                return detector, []
+                return [(detector, [])]
+
+        tasks = [asyncio.create_task(_run_one(d)) for d in others]
+        if shared:
+            tasks.append(asyncio.create_task(_run_shared()))
 
-        tasks = [asyncio.create_task(_run(d)) for d in applicable]
         for coro in asyncio.as_completed(tasks):
-            detector, found = await coro
-            deduped = self._deduplicate(found, seen)
-            deduped = self._apply_exclusions(deduped)
-            for env in deduped:
-                self._mark_system_critical(env)
-            yield detector, deduped
+            for detector, found in await coro:
+                deduped = self._process(found, seen)
+                yield detector, deduped
 
     # ------------------------------------------------------------------ #
     #  Helpers                                                             #
     # ------------------------------------------------------------------ #
 
+    def _shared_walk_groups(
+        self, shared: list[AbstractDetector], path: Path
+    ) -> list[tuple[AbstractDetector, list[Environment]]]:
+        """Run the one shared walk, returning ``(detector, envs)`` per detector.
+
+        The local tree is walked once for the union of *shared* detector names;
+        each detector also contributes its own global scan (pip/uv caches).
+        Results are grouped back per detector via :data:`TYPE_TO_DETECTOR` so the
+        per-detector progress contract is preserved.
+        """
+        if not shared:
+            return []
+        active = {d.name for d in shared}
+        found = walk_environments(path, active)
+        for detector in shared:
+            found.extend(detector.scan_global(path))
+        by_name: dict[str, list[Environment]] = {d.name: [] for d in shared}
+        for env in found:
+            name = TYPE_TO_DETECTOR.get(env.type)
+            if name in by_name:
+                by_name[name].append(env)
+        return [(d, by_name[d.name]) for d in shared]
+
+    def _process(self, found: list[Environment], seen: set[Path]) -> list[Environment]:
+        """Deduplicate, apply exclusions, and flag system-critical envs."""
+        deduped = self._deduplicate(found, seen)
+        deduped = self._apply_exclusions(deduped)
+        for env in deduped:
+            self._mark_system_critical(env)
+        return deduped
+
     @staticmethod
     def _deduplicate(envs: list[Environment], seen: set[Path]) -> list[Environment]:
         """Filter out environments whose resolved path has already been seen.

{killpy-1.0.0 → killpy-1.0.1}/killpy.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: killpy
-Version: 1.0.0
+Version: 1.0.1
 Summary: Find and delete unused Python environments (.venv, conda, poetry, pipenv, pipx, pyenv, uv) and caches to free disk space — from a fast terminal UI or a single CLI command.
 Project-URL: Homepage, https://github.com/Tlaloc-Es/killpy
 Project-URL: Documentation, https://tlaloc-es.github.io/killpy/
 Project-URL: Repository, https://github.com/Tlaloc-Es/killpy
 Project-URL: Bug Tracker, https://github.com/Tlaloc-Es/killpy/issues
 Keywords: venv,virtualenv,conda,poetry,pipenv,pipx,pyenv,uv,cleanup,disk-space,cache,cli,tui,textual,developer-tools
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: Console :: Curses
 Classifier: Intended Audience :: Developers
@@ -603,7 +603,7 @@ ______________________________________________________________________
 
 ```yaml
 - repo: https://github.com/Tlaloc-Es/KillPy
-  rev: 1.0.0
+  rev: 1.0.1
   hooks:
     - id: killpy                  # remove __pycache__ on every commit
     - id: killpy-clean-caches     # also removes .mypy_cache, .pytest_cache, .ruff_cache
@@ -628,7 +628,7 @@ Typical minimal setup (safe for daily use):
 
 ```yaml
 - repo: https://github.com/Tlaloc-Es/KillPy
-  rev: 1.0.0
+  rev: 1.0.1
   hooks:
     - id: killpy
 ```

{killpy-1.0.0 → killpy-1.0.1}/killpy.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ killpy/commands/find.py
 killpy/commands/list.py
 killpy/commands/stats.py
 killpy/detectors/__init__.py
+killpy/detectors/_shared_walk.py
 killpy/detectors/artifacts.py
 killpy/detectors/base.py
 killpy/detectors/cache.py

{killpy-1.0.0 → killpy-1.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "killpy"
-version = "1.0.0"
+version = "1.0.1"
 description = "Find and delete unused Python environments (.venv, conda, poetry, pipenv, pipx, pyenv, uv) and caches to free disk space — from a fast terminal UI or a single CLI command."
 readme = "README.md"
 keywords = [
@@ -21,7 +21,7 @@ keywords = [
     "developer-tools",
 ]
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "Environment :: Console :: Curses",
     "Intended Audience :: Developers",
@@ -75,6 +75,9 @@ package = true
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = "-v --tb=short --cov=killpy --cov-report=term-missing --cov-report=xml"
+markers = [
+    "integration: system-level end-to-end tests (real envs + real deletion); require KILLPY_INTEGRATION=1",
+]
 
 [tool.coverage.run]
 branch = true
@@ -103,5 +106,9 @@ lint = "ruff check killpy tests"
 format = "ruff format killpy tests"
 type = "mypy killpy"
 
+[tool.poe.tasks.integration]
+cmd = "pytest -m integration --no-cov tests/integration"
+env = { KILLPY_INTEGRATION = "1" }
+
 [project.scripts]
 killpy = "killpy.__main__:cli"