Fix Windows uv self-update by deferring install until process exits

Author: claudiodsf

seiscat/self/update.py

@@ -70,14 +70,48 @@ def _schedule_windows_pip_uninstall():
     ])
 
 
+def _schedule_windows_uv_tool_install(package_spec):
+    """Schedule uv tool install after current process exits (Windows only)."""
+    helper_code = (
+        'import ctypes, subprocess, sys, time\n'
+        'pid = int(sys.argv[1])\n'
+        'spec = sys.argv[2]\n'
+        'sync = 0x00100000\n'
+        'infinite = 0xFFFFFFFF\n'
+        'kernel32 = ctypes.windll.kernel32\n'
+        'handle = kernel32.OpenProcess(sync, False, pid)\n'
+        'if handle:\n'
+        '    kernel32.WaitForSingleObject(handle, infinite)\n'
+        '    kernel32.CloseHandle(handle)\n'
+        'else:\n'
+        '    time.sleep(1)\n'
+        'cmd = ["uv", "tool", "install", spec, "--upgrade", "--force"]\n'
+        'for _ in range(8):\n'
+        '    if subprocess.run(cmd, check=False).returncode == 0:\n'
+        '        break\n'
+        '    time.sleep(1)\n'
+    )
+    subprocess.Popen([
+        sys.executable,
+        '-c',
+        helper_code,
+        str(os.getpid()),
+        package_spec,
+    ])
+
+
 def _pip_update_release():
     _run_checked([
         sys.executable, '-m', 'pip', 'install', '--upgrade', 'seiscat'
     ])
 
 
 def _uv_update_release():
+    if os.name == 'nt':
+        _schedule_windows_uv_tool_install('seiscat')
+        return True
     _run_checked(['uv', 'tool', 'install', 'seiscat', '--upgrade', '--force'])
+    return False
 
 
 def _pip_update_git():
@@ -89,9 +123,13 @@ def _pip_update_git():
 
 def _uv_update_git():
     git_spec = _git_install_spec_with_extras()
+    if os.name == 'nt':
+        _schedule_windows_uv_tool_install(git_spec)
+        return True
     _run_checked([
         'uv', 'tool', 'install', git_spec, '--upgrade', '--force'
     ])
+    return False
 
 
 def _is_release_higher(installed_version, latest_release_version):
@@ -115,7 +153,12 @@ def update_seiscat(git=False):
 
     if git:
         if context.installer == 'uv' and uv_available:
-            _uv_update_git()
+            deferred = _uv_update_git()
+            if deferred:
+                return (
+                    'Windows detected: git update has been scheduled via uv '
+                    'and will run after seiscat exits.'
+                )
             return 'Updated to latest git version using uv.'
         _pip_update_git()
         return 'Updated to latest git version using pip.'
@@ -125,7 +168,15 @@ def update_seiscat(git=False):
         if _is_release_higher(context.version_installed, latest_release):
             # Switch back to release because release is newer
             if context.installer == 'uv' and uv_available:
-                _uv_update_release()
+                deferred = _uv_update_release()
+                if deferred:
+                    return (
+                        f'Latest release ({latest_release}) '
+                        'is newer than installed git '
+                        f'version ({context.version_installed}); '
+                        'switch to release has been scheduled via uv '
+                        'and will run after seiscat exits.'
+                    )
                 return (
                     f'Latest release ({latest_release}) '
                     'is newer than installed git '
@@ -159,7 +210,12 @@ def update_seiscat(git=False):
         )
 
     if context.installer == 'uv' and uv_available:
-        _uv_update_release()
+        deferred = _uv_update_release()
+        if deferred:
+            return (
+                'Windows detected: release update has been scheduled via uv '
+                'and will run after seiscat exits.'
+            )
         return 'Updated to latest release using uv.'
     _pip_update_release()
     return 'Updated to latest release using pip.'

tests/test_self_update_policy.py

@@ -7,8 +7,10 @@
 
 from seiscat.self.install_detection import InstallContext
 from seiscat.self.update import (
+    _schedule_windows_uv_tool_install,
     _pip_update_git,
     _uv_update_git,
+    _uv_update_release,
     uninstall_seiscat,
     update_seiscat,
 )
@@ -18,7 +20,7 @@ class TestSelfUpdatePolicy(unittest.TestCase):
     """Validate release/git policy for `seiscat self update`."""
 
     @patch('seiscat.self.update.shutil.which', return_value='/usr/bin/uv')
-    @patch('seiscat.self.update._uv_update_release')
+    @patch('seiscat.self.update._uv_update_release', return_value=False)
     @patch('seiscat.self.update.detect_install_context')
     @patch(
         'seiscat.self.update.get_latest_release_version',
@@ -172,9 +174,11 @@ def test_pip_update_git_installs_extras(self, mock_run_checked):
         ])
 
     @patch('seiscat.self.update._run_checked')
+    @patch('seiscat.self.update.os.name', 'posix')
     def test_uv_update_git_installs_extras(self, mock_run_checked):
-        _uv_update_git()
+        deferred = _uv_update_git()
 
+        self.assertFalse(deferred)
         mock_run_checked.assert_called_once_with([
             'uv',
             'tool',
@@ -184,3 +188,55 @@ def test_uv_update_git_installs_extras(self, mock_run_checked):
             '--upgrade',
             '--force',
         ])
+
+    @patch('seiscat.self.update._schedule_windows_uv_tool_install')
+    @patch('seiscat.self.update.os.name', 'nt')
+    def test_uv_update_git_is_deferred_on_windows(self, mock_schedule):
+        deferred = _uv_update_git()
+
+        self.assertTrue(deferred)
+        mock_schedule.assert_called_once_with(
+            'seiscat[cartopy,plotly,folium] @ '
+            'git+https://github.com/SeismicSource/seiscat.git'
+        )
+
+    @patch('seiscat.self.update._schedule_windows_uv_tool_install')
+    @patch('seiscat.self.update.os.name', 'nt')
+    def test_uv_update_release_is_deferred_on_windows(self, mock_schedule):
+        deferred = _uv_update_release()
+
+        self.assertTrue(deferred)
+        mock_schedule.assert_called_once_with('seiscat')
+
+    @patch('seiscat.self.update.shutil.which', return_value='uv')
+    @patch('seiscat.self.update.detect_install_context')
+    @patch('seiscat.self.update._uv_update_git', return_value=True)
+    def test_update_git_reports_scheduled_on_windows(
+            self,
+            _mock_uv_update_git,
+            mock_detect,
+            _mock_which):
+        mock_detect.return_value = InstallContext(
+            installer='uv',
+            channel='release',
+            version_installed='0.9.1',
+            source_url=None,
+            editable=False,
+            confidence='high',
+        )
+
+        msg = update_seiscat(git=True)
+        self.assertIn('scheduled', msg)
+
+    @patch('seiscat.self.update.os.getpid', return_value=1234)
+    @patch('seiscat.self.update.sys.executable', 'C:/Python/python.exe')
+    @patch('seiscat.self.update.subprocess.Popen')
+    def test_windows_uv_helper_uses_retry_loop(self, mock_popen, _mock_getpid):
+        _schedule_windows_uv_tool_install('seiscat')
+
+        mock_popen.assert_called_once()
+        cmd = mock_popen.call_args[0][0]
+        self.assertEqual(cmd[0], 'C:/Python/python.exe')
+        self.assertEqual(cmd[1], '-c')
+        self.assertIn('for _ in range(8):', cmd[2])
+        self.assertIn('time.sleep(1)', cmd[2])