Visitar URL original
Revert "Fix version check timeout" by n-poulsen · Pull Request #2807 · DeepLabCut/DeepLabCut · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 4 additions & 25 deletions deeplabcut/gui/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
from pathlib import Path
from typing import List
from urllib.error import URLError
from concurrent.futures import ThreadPoolExecutor, TimeoutError
import qdarkstyle
import multiprocessing

import deeplabcut
from deeplabcut import auxiliaryfunctions, VERSION, compat
Expand All @@ -42,30 +42,9 @@


def call_with_timeout(func, timeout, *args, **kwargs):
def wrapper(queue, *args, **kwargs):
try:
result = func(*args, **kwargs)
queue.put(result) # Pass the result back via the queue
except Exception as e:
queue.put(e) # Pass any exception back via the queue

queue = multiprocessing.Queue()
process = multiprocessing.Process(target=wrapper, args=(queue, *args), kwargs=kwargs)
process.start()
process.join(timeout)

if process.is_alive():
process.terminate() # Forcefully terminate the process
process.join()
raise TimeoutError(f"Function {func.__name__} did not complete within {timeout} seconds.")

if not queue.empty():
result = queue.get()
if isinstance(result, Exception):
raise result # Re-raise the exception if it occurred in the function
return result
else:
raise TimeoutError(f"Function {func.__name__} completed but did not return a result.")
with ThreadPoolExecutor(max_workers=1) as executor:
future = executor.submit(func, *args, **kwargs)
return future.result(timeout=timeout)


def _check_for_updates(silent=True):
Expand Down
33 changes: 0 additions & 33 deletions tests/gui/test_gui_window.py

This file was deleted.