Merge pull request #69 from DavidCEllis/resolve-uv-symlinks

Make the UV python listing manager use the keys as given

Author: DavidCEllis

pyproject.toml

@@ -16,10 +16,10 @@ license = "MIT"
 license-files = ["LICENSE"]
 requires-python = ">=3.10"
 dependencies = [
-    "ducktools-classbuilder>=0.10.0",
-    "ducktools-pythonfinder>=0.10.3",
+    "ducktools-classbuilder>=0.11.1",
+    "ducktools-pythonfinder>=0.10.4",
     "ducktools-lazyimporter>=0.8.4",
-    "textual>=5.0.1",
+    "textual>=8.0.0",
 ]
 classifiers = [
     "Development Status :: 2 - Pre-Alpha",

requirements.txt

@@ -1,8 +1,8 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile /home/ducksual/src/ducktools-pytui/pyproject.toml --universal --generate-hashes -o /home/ducksual/src/ducktools-pytui/requirements.txt
-ducktools-classbuilder==0.11.1 \
-    --hash=sha256:abb415d654a5414067d5ff0886e540bb463aac9f14b472e7384e6dd5dda2df96 \
-    --hash=sha256:fdf2044e125a1b823c939c892cf97c9af124fa5870d4923cca853a3442f19002
+ducktools-classbuilder==0.12.4 \
+    --hash=sha256:43b31b6576fa43d481c7f6e51481589d7bdeb487af71f6711c9530ae04c20df4 \
+    --hash=sha256:676d681749a854818fd4f7e8cbcb0e699927c98fe92df086e50861efee968f26
     # via
     #   ducktools-pytui (pyproject.toml)
     #   ducktools-pythonfinder
@@ -12,9 +12,9 @@ ducktools-lazyimporter==0.8.4 \
     # via
     #   ducktools-pytui (pyproject.toml)
     #   ducktools-pythonfinder
-ducktools-pythonfinder==0.10.3 \
-    --hash=sha256:118ecae6b4ec5bd428ed907c006958d6465379465bf696b6712c13117b4d792b \
-    --hash=sha256:301ca8d4cd244e512cc679fb3559e1c952e2dd0c90e1382a0b12ee1821937afa
+ducktools-pythonfinder==0.10.4 \
+    --hash=sha256:4bbcd5167581b78392d9a358fa12c3de9e3fbef8b51d54d835c33143566e34b1 \
+    --hash=sha256:9af72d67afd3d95c4baf8c470c6250c2c16d971acecde23bb44059a4c340a42d
     # via ducktools-pytui (pyproject.toml)
 linkify-it-py==2.0.3 \
     --hash=sha256:68cda27e162e9215c17d786649d1da0021a451bdc436ef9e0fa0ba5234b9b048 \
@@ -35,27 +35,27 @@ mdurl==0.1.2 \
     --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \
     --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
     # via markdown-it-py
-packaging==25.0 \
-    --hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 \
-    --hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f
+packaging==26.0 \
+    --hash=sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4 \
+    --hash=sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529
     # via ducktools-pythonfinder
-platformdirs==4.5.0 \
-    --hash=sha256:70ddccdd7c99fc5942e9fc25636a8b34d04c24b335100223152c2803e4063312 \
-    --hash=sha256:e578a81bb873cbb89a41fcc904c7ef523cc18284b7e3b3ccf06aca1403b7ebd3
+platformdirs==4.9.2 \
+    --hash=sha256:9170634f126f8efdae22fb58ae8a0eaa86f38365bc57897a6c4f781d1f5875bd \
+    --hash=sha256:9a33809944b9db043ad67ca0db94b14bf452cc6aeaac46a88ea55b26e2e9d291
     # via textual
 pygments==2.19.2 \
     --hash=sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887 \
     --hash=sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b
     # via
     #   rich
     #   textual
-rich==14.2.0 \
-    --hash=sha256:73ff50c7c0c1c77c8243079283f4edb376f0f6442433aecb8ce7e6d0b92d1fe4 \
-    --hash=sha256:76bc51fe2e57d2b1be1f96c524b890b816e334ab4c1e45888799bfaab0021edd
+rich==14.3.3 \
+    --hash=sha256:793431c1f8619afa7d3b52b2cdec859562b950ea0d4b6b505397612db8d5362d \
+    --hash=sha256:b8daa0b9e4eef54dd8cf7c86c03713f53241884e814f4e2f5fb342fe520f639b
     # via textual
-textual==6.4.0 \
-    --hash=sha256:b346dbb8e12f17cefb33ddfdf7f19bdc9e66c29daf82fc981a8db6b7d985e115 \
-    --hash=sha256:f40df9165a001c10249698d532f2f5a71708b70f0e4ef3fce081a9dd93ffeaaa
+textual==8.0.0 \
+    --hash=sha256:8908f4ebe93a6b4f77ca7262197784a52162bc88b05f4ecf50ac93a92d49bb8f \
+    --hash=sha256:ce48f83a3d686c0fac0e80bf9136e1f8851c653aa6a4502e43293a151df18809
     # via ducktools-pytui (pyproject.toml)
 typing-extensions==4.15.0 \
     --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \

src/ducktools/pytui/runtime_installers/base.py

@@ -139,6 +139,6 @@ def find_matching_listing(self, install: PythonInstall) -> Listing | None:
             if py.path is not None
         }
 
-        install_path = os.path.dirname(install.executable)
+        install_path = os.path.realpath(os.path.dirname(install.executable))
 
         return installed_dict.get(install_path, None)

src/ducktools/pytui/runtime_installers/uv.py

@@ -52,11 +52,13 @@ def __prefab_post_init__(self, key: str, path: str | None) -> None:
             self.path = path
         else:
             # Resolve path always, sometimes UV gives a relative path to cwd.
-            self.path = os.path.abspath(path)
+            # Sometimes the path is also a symlink
+            self.path = os.path.realpath(os.path.abspath(path))
 
             # UV bug - key and path can mismatch if someone typoed the metadata
             base_path = self.manager.runtime_folder
             if base_path:
+                base_path = os.path.realpath(base_path)  # resolve base path symlink too
                 key_path = str(Path(self.path).relative_to(base_path).parts[0])
                 self.key = key if key == key_path else key_path
 
@@ -75,7 +77,7 @@ def from_dict(cls, manager: UVManager, entry: dict[str, Any]) -> UVPythonListing
     def install(self) -> subprocess.CompletedProcess | None:
         if self.manager.executable is None:
             raise FileNotFoundError("Could not find the 'uv' executable on PATH")
-        
+
         if self.path:
             # Can't install already installed Python
             return None
@@ -96,7 +98,7 @@ def install(self) -> subprocess.CompletedProcess | None:
     def uninstall(self) -> subprocess.CompletedProcess | None:
         if self.manager.executable is None:
             raise FileNotFoundError("Could not find the 'uv' executable on PATH")
-        
+
         if not (self.path and os.path.exists(self.path)):
             # Can't uninstall non-installed Python
             return None