Merge branch 'master' into setup_flow

.github/workflows/selfdrive_tests.yaml

@@ -163,7 +163,7 @@ jobs:
       run: |
         ${{ env.RUN }} "source selfdrive/test/setup_xvfb.sh && \
                         $PYTEST --collect-only -m 'not slow' &> /dev/null && \
-                        PYTHONTRACEMALLOC=1 MAX_EXAMPLES=1 $PYTEST -m 'not slow' -k test_raylib_ui && \
+                        MAX_EXAMPLES=1 $PYTEST -m 'not slow' && \
                         ./selfdrive/ui/tests/create_test_translations.sh && \
                         QT_QPA_PLATFORM=offscreen ./selfdrive/ui/tests/test_translations && \
                         chmod -R 777 /tmp/comma_download_cache"

system/ui/setup.py

@@ -4,7 +4,7 @@ import re
 import threading
 import time
 import urllib.request
-import urllib.parse
+from urllib.parse import urlparse
 from enum import IntEnum
 import shutil
 
@@ -324,12 +324,9 @@ class Setup(Widget):
     if re.match("^([^/.]+)/([^/]+)$", url):
       url = f"https://installer.comma.ai/{url}"
 
-    parsed = urllib.parse.urlparse(url, scheme='https')
-    if not parsed.netloc:
-      parsed = urllib.parse.urlparse(f"{'https'}://{url}")
-    url = urllib.parse.urlunparse(parsed)
+    parsed = urlparse(url, scheme='https')
+    self.download_url = (urlparse(f"https://{url}") if not parsed.netloc else parsed).geturl()
 
-    self.download_url = url
     self.state = SetupState.DOWNLOADING
 
     self.download_thread = threading.Thread(target=self._download_thread, daemon=True)