calkit-python 0.30.5__tar.gz → 0.30.6__tar.gz

{calkit_python-0.30.5 → calkit_python-0.30.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: calkit-python
-Version: 0.30.5
+Version: 0.30.6
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://calkit.org
 Project-URL: Issues, https://github.com/calkit/calkit/issues

{calkit_python-0.30.5 → calkit_python-0.30.6}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.30.5"
+__version__ = "0.30.6"
 
 from .core import *  # noqa: F403, I001
 from . import git  # noqa: F401

{calkit_python-0.30.5 → calkit_python-0.30.6}/calkit/cli/main.py

@@ -9,6 +9,7 @@ import logging
 import os
 import platform as _platform
 import posixpath
+import shutil
 import subprocess
 import sys
 import time
@@ -1828,20 +1829,41 @@ def set_env_var(
 @app.command(name="upgrade")
 def upgrade():
     """Upgrade Calkit."""
-    if calkit.check_dep_exists("pipx"):
-        cmd = ["pipx", "upgrade", "calkit-python"]
-    elif calkit.check_dep_exists("uv"):
+    # First detect how Calkit is installed
+    # If installed with uv tool, calkit will be located at something like
+    # ~/.local/bin/calkit
+    which_calkit = shutil.which("calkit")
+    if which_calkit is None:
+        raise_error("Calkit is not installed")
+    split_path = os.path.normpath(str(which_calkit)).split(os.sep)
+    if (
+        ".local" in split_path
+        and "bin" in split_path
+        and calkit.check_dep_exists("uv")
+    ):
+        # This is a uv tool install
         cmd = [
             "uv",
-            "pip",
+            "tool",
             "install",
-            "--system",
             "--upgrade",
             "calkit-python",
         ]
+    elif "pipx" in split_path and calkit.check_dep_exists("pipx"):
+        cmd = ["pipx", "upgrade", "calkit-python"]
     else:
-        cmd = ["pip", "install", "--upgrade", "calkit-python"]
-    subprocess.run(cmd)
+        cmd = [
+            sys.executable,
+            "-m",
+            "pip",
+            "install",
+            "--upgrade",
+            "calkit-python",
+        ]
+    res = subprocess.run(cmd)
+    if res.returncode != 0:
+        raise_error("Upgrade failed")
+    typer.echo("Success!")
 
 
 @app.command(name="switch-branch")

{calkit_python-0.30.5 → calkit_python-0.30.6}/calkit/config.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import os
 import platform
+import warnings
 from typing import Any, Literal
 from typing import get_args as get_type_args
 
@@ -38,6 +39,9 @@ def supports_keyring() -> bool:
     except keyring.errors.InitError:
         # Backend failed to initialize (e.g., user dismissed prompt)
         return False
+    except keyring.errors.KeyringLocked:
+        warnings.warn("Keyring is locked; will use YAML config file")
+        return False
     except keyring.errors.KeyringError as e:
         # Check if the underlying exception indicates no backend
         if "No backend found" in str(e):