kiwi-code 0.0.507__tar.gz → 0.0.509__tar.gz

{kiwi_code-0.0.507 → kiwi_code-0.0.509}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: kiwi-code
-Version: 0.0.507
+Version: 0.0.509
 Summary: A textual-based terminal user interface application
 Project-URL: Homepage, https://kiwicode.ai
 Author-email: Anurag <anurag@meetkiwi.co>

{kiwi_code-0.0.507 → kiwi_code-0.0.509}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kiwi-code"
-version = "0.0.507"
+version = "0.0.509"
 description = "A textual-based terminal user interface application"
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.11,<4.0"

{kiwi_code-0.0.507 → kiwi_code-0.0.509}/src/kiwi_tui/autoupdate.py

@@ -14,8 +14,10 @@ cannot be replaced), a start that is not interactive, or when turned off with
 """
 from __future__ import annotations
 
+import importlib.util
 import json
 import os
+import shutil
 import subprocess
 import sys
 import time
@@ -87,13 +89,17 @@ def record_latest(version: str) -> None:
     _write_state(latest=str(version), checked_at=time.time())
 
 
-def newer(latest: str, current: str) -> bool:
-    try:
-        from packaging.version import Version
+def _release(version: str) -> tuple[int, ...] | None:
+    """A release version as numbers: kiwi's are always "1.2.3" (scripts/set_edition.py)."""
+    parts = str(version or "").strip().split(".")
+    return tuple(int(p) for p in parts) if all(p.isdigit() for p in parts) else None
 
-        return Version(latest) > Version(current)
-    except Exception:
-        return False
+
+def newer(latest: str, current: str) -> bool:
+    """Whether `latest` is a later release than `current`. Compared here rather than with
+    `packaging`, which kiwi does not depend on: an install from PyPI does not have it."""
+    a, b = _release(latest), _release(current)
+    return a is not None and b is not None and a > b
 
 
 def pending(current: str, *, now: float | None = None) -> str | None:
@@ -150,10 +156,18 @@ def installer(package: str, *, prefix: str | None = None, base_prefix: str | Non
         return Installer("uv", ("uv", "tool", "upgrade", package), f"uv tool upgrade {package}")
     if (env / "pipx_metadata.json").exists() or ("pipx" in parts and "venvs" in parts):
         return Installer("pipx", ("pipx", "upgrade", package), f"pipx upgrade {package}")
-    return Installer(
-        "pip", (sys.executable, "-m", "pip", "install", "--upgrade", "--quiet", package),
-        f"pip install --upgrade {package}",
-    )
+    # A plain virtual environment: with its own pip, or (made by `uv venv`) without one.
+    if importlib.util.find_spec("pip") is not None:
+        return Installer(
+            "pip", (sys.executable, "-m", "pip", "install", "--upgrade", "--quiet", package),
+            f"pip install --upgrade {package}",
+        )
+    if shutil.which("uv"):
+        return Installer(
+            "uv pip", ("uv", "pip", "install", "--upgrade", "--quiet", "--python", sys.executable, package),
+            f"uv pip install --upgrade {package}",
+        )
+    return None
 
 
 def manual_command(package: str) -> str:

{kiwi_code-0.0.507 → kiwi_code-0.0.509}/src/kiwi_tui/main.py

@@ -1206,7 +1206,10 @@ def main() -> int:
     argv = sys.argv[1:]
 
     if "--version" in argv:
-        print(f"kiwi {KIWI_CODE_VERSION}")
+        # The package as well: kiwi-ai and kiwi-code are both `kiwi`.
+        from kiwi_cli.edition import BUILD_EDITION
+
+        print(f"{BUILD_EDITION} {KIWI_CODE_VERSION}")
         return 0
 
     if argv and argv[0] in {"alt", "term"}:

{kiwi_code-0.0.507 → kiwi_code-0.0.509}/tests/test_autoupdate.py

@@ -3,6 +3,7 @@ next start, with the tool kiwi was installed with, and the new version is starte
 from __future__ import annotations
 
 import subprocess
+import sys
 import time
 import types
 
@@ -27,15 +28,26 @@ def home(isolated_home, monkeypatch):
     return isolated_home
 
 
-def test_each_install_is_updated_with_its_own_tool(home) -> None:
+def test_each_install_is_updated_with_its_own_tool(home, monkeypatch) -> None:
     uv = autoupdate.installer("kiwi-code", prefix=UV_TOOL, base_prefix="/usr", platform="linux")
     assert uv.command == ("uv", "tool", "upgrade", "kiwi-code")
     pipx = autoupdate.installer("kiwi-code", prefix=PIPX, base_prefix="/usr", platform="darwin")
     assert pipx.command == ("pipx", "upgrade", "kiwi-code")
+    monkeypatch.setattr(autoupdate.importlib.util, "find_spec", lambda name: object())  # has pip
     venv = autoupdate.installer("kiwi-code", prefix="/proj/.venv", base_prefix="/usr", platform="linux")
     assert venv.name == "pip" and venv.command[-1] == "kiwi-code" and "--upgrade" in venv.command
 
 
+def test_a_virtual_environment_without_pip_is_updated_with_uv_or_not_at_all(home, monkeypatch) -> None:
+    monkeypatch.setattr(autoupdate.importlib.util, "find_spec", lambda name: None)
+    monkeypatch.setattr(autoupdate.shutil, "which", lambda name: "/usr/bin/uv")
+    venv = autoupdate.installer("kiwi-code", prefix="/proj/.venv", base_prefix="/usr", platform="linux")
+    assert venv.command[:3] == ("uv", "pip", "install") and venv.command[-1] == "kiwi-code"
+    assert ("--python", autoupdate.sys.executable) == venv.command[-3:-1]
+    monkeypatch.setattr(autoupdate.shutil, "which", lambda name: None)
+    assert autoupdate.installer("kiwi-code", prefix="/proj/.venv", base_prefix="/usr", platform="linux") is None
+
+
 def test_a_tool_folder_kept_elsewhere_is_known_by_the_file_the_tool_leaves(home, tmp_path) -> None:
     uv, pipx = tmp_path / "tools" / "kiwi-code", tmp_path / "apps" / "kiwi-code"
     uv.mkdir(parents=True)
@@ -221,3 +233,27 @@ async def test_pypi_is_asked_about_the_installed_package(home, monkeypatch) -> N
     assert asked == ["https://pypi.org/pypi/kiwi-code/json"]
     assert autoupdate._read_all() == {"kiwi-code": {"latest": "99.0.0", "checked_at": pytest.approx(time.time(), abs=60)}}
     assert "v99.0.0" in screen._upgrade_tip
+
+
+def test_the_version_names_the_package(monkeypatch, capsys) -> None:
+    from kiwi_cli import edition
+    from kiwi_tui import main
+
+    monkeypatch.setattr(edition, "BUILD_EDITION", "kiwi-code")
+    monkeypatch.setattr(main, "KIWI_CODE_VERSION", "0.0.508")
+    monkeypatch.setattr(main, "_reexec_as_kiwi", lambda: None)
+    monkeypatch.setattr(main.sys, "argv", ["kiwi", "--version"])
+    assert main.main() == 0
+    assert capsys.readouterr().out == "kiwi-code 0.0.508\n"
+
+
+def test_versions_are_compared_without_packaging(monkeypatch) -> None:
+    # An install from PyPI does not have `packaging` (kiwi does not depend on it).
+    monkeypatch.setitem(sys.modules, "packaging", None)
+    monkeypatch.setitem(sys.modules, "packaging.version", None)
+    assert autoupdate.newer("0.0.508", "0.0.507")
+    assert autoupdate.newer("0.0.10", "0.0.9")  # by number, not as text
+    assert autoupdate.newer("0.1.0", "0.0.999")
+    assert not autoupdate.newer("0.0.507", "0.0.507")
+    assert not autoupdate.newer("0.0.506", "0.0.507")
+    assert not autoupdate.newer("0.0.508rc1", "0.0.507") and not autoupdate.newer("", "0.0.507")

{kiwi_code-0.0.507 → kiwi_code-0.0.509}/uv.lock

@@ -412,7 +412,7 @@ wheels = [
 
 [[package]]
 name = "kiwi-code"
-version = "0.0.507"
+version = "0.0.509"
 source = { editable = "." }
 dependencies = [
     { name = "codeglass" },