flet-desktop 1.1.0.dev1__tar.gz → 1.1.0.dev2__tar.gz

{flet_desktop-1.1.0.dev1 → flet_desktop-1.1.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-desktop
-Version: 1.1.0.dev1
+Version: 1.1.0.dev2
 Summary: Flet Desktop client in Flutter
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/flet-dev/flet
 Project-URL: Documentation, https://flet.dev/docs
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: flet==1.1.0.dev1
+Requires-Dist: flet==1.1.0.dev2
 Requires-Dist: rich>=13.0.0
 
 # Flet Desktop client in Flutter

{flet_desktop-1.1.0.dev1 → flet_desktop-1.1.0.dev2}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-desktop"
-version = "1.1.0.dev1"
+version = "1.1.0.dev2"
 description = "Flet Desktop client in Flutter"
 authors = [{ name = "Appveyor Systems Inc.", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==1.1.0.dev1",
+    "flet==1.1.0.dev2",
     "rich >=13.0.0"
 ]
 

{flet_desktop-1.1.0.dev1 → flet_desktop-1.1.0.dev2}/src/flet_desktop/__init__.py

@@ -35,13 +35,13 @@ logger = logging.getLogger(flet_desktop.__name__)
 
 # Supported Linux build targets ordered by glibc version.
 # Each entry maps a minimum glibc (major, minor) to a distro_id used in
-# release artifact filenames.
+# release artifact filenames, and the architectures it is built for.
 _GLIBC_DISTRO_TABLE = [
-    ((2, 28), "debian10"),
-    ((2, 31), "ubuntu20.04"),
-    ((2, 35), "ubuntu22.04"),
-    ((2, 36), "debian12"),
-    ((2, 39), "ubuntu24.04"),
+    ((2, 28), "debian10", ("amd64",)),
+    ((2, 31), "ubuntu20.04", ("amd64", "arm64")),
+    ((2, 35), "ubuntu22.04", ("amd64", "arm64")),
+    ((2, 36), "debian12", ("amd64", "arm64")),
+    ((2, 39), "ubuntu24.04", ("amd64", "arm64")),
 ]
 
 
@@ -117,29 +117,46 @@ def __get_system_glibc_version():
         return (0, 0)
 
 
-def __get_linux_distro_id():
+def __get_linux_distro_id(arch: str):
     """
     Return the distro id to use for downloading the Linux binary archive.
 
     Uses glibc version detection to pick the best matching build target
-    (highest glibc requirement that is <= system glibc).  Can be
+    for `arch` (highest glibc requirement that is <= system glibc).  Can be
     overridden via the `FLET_LINUX_DISTRO` environment variable.
+
+    Raises:
+        RuntimeError: If the system glibc is older than every build for `arch`.
     """
 
     override = os.environ.get("FLET_LINUX_DISTRO", "").strip()
     if override:
         return override
 
+    targets = [
+        (required_glibc, distro_id)
+        for required_glibc, distro_id, arches in _GLIBC_DISTRO_TABLE
+        if arch in arches
+    ]
+    if not targets:
+        raise RuntimeError(f"Flet desktop client is not available for Linux {arch}.")
     sys_glibc = __get_system_glibc_version()
     best = None
-    for required_glibc, distro_id in _GLIBC_DISTRO_TABLE:
+    for required_glibc, distro_id in targets:
         if sys_glibc >= required_glibc:
             best = distro_id
     if best is None:
-        best = _GLIBC_DISTRO_TABLE[0][1]  # oldest as last resort
-        logger.warning(
-            f"Could not detect glibc version (got {sys_glibc}), "
-            f"falling back to {best}. Set FLET_LINUX_DISTRO to override."
+        oldest_glibc, oldest = targets[0]
+        if sys_glibc == (0, 0):
+            logger.warning(
+                "Could not detect glibc version, "
+                f"falling back to {oldest}. Set FLET_LINUX_DISTRO to override."
+            )
+            return oldest
+        raise RuntimeError(
+            f"Flet desktop client for Linux {arch} requires glibc "
+            f"{oldest_glibc[0]}.{oldest_glibc[1]} or newer, "
+            f"but this system has glibc {sys_glibc[0]}.{sys_glibc[1]}."
         )
     return best
 
@@ -158,8 +175,8 @@ def get_artifact_filename():
     if is_macos():
         return "flet-macos.tar.gz"
     # Linux
-    distro = __get_linux_distro_id()
     arch = get_arch()
+    distro = __get_linux_distro_id(arch)
     flavor = __get_desktop_flavor()
     if flavor == "light":
         return f"flet-linux-{distro}-light-{arch}.tar.gz"

flet_desktop-1.1.0.dev2/src/flet_desktop/version.py

@@ -0,0 +1 @@
+version = "1.1.0.dev2"

{flet_desktop-1.1.0.dev1 → flet_desktop-1.1.0.dev2}/src/flet_desktop.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-desktop
-Version: 1.1.0.dev1
+Version: 1.1.0.dev2
 Summary: Flet Desktop client in Flutter
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/flet-dev/flet
 Project-URL: Documentation, https://flet.dev/docs
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: flet==1.1.0.dev1
+Requires-Dist: flet==1.1.0.dev2
 Requires-Dist: rich>=13.0.0
 
 # Flet Desktop client in Flutter

{flet_desktop-1.1.0.dev1 → flet_desktop-1.1.0.dev2}/src/flet_desktop.egg-info/SOURCES.txt

@@ -7,4 +7,5 @@ src/flet_desktop.egg-info/PKG-INFO
 src/flet_desktop.egg-info/SOURCES.txt
 src/flet_desktop.egg-info/dependency_links.txt
 src/flet_desktop.egg-info/requires.txt
-src/flet_desktop.egg-info/top_level.txt
+src/flet_desktop.egg-info/top_level.txt
+tests/test_linux_client_artifact.py

flet_desktop-1.1.0.dev2/src/flet_desktop.egg-info/requires.txt

@@ -0,0 +1,2 @@
+flet==1.1.0.dev2
+rich>=13.0.0

flet_desktop-1.1.0.dev2/tests/test_linux_client_artifact.py

@@ -0,0 +1,62 @@
+"""Choosing the Linux desktop client to download.
+
+The client is built against several glibc versions, but not every one of
+them for every architecture: there is no Debian 10 (glibc 2.28) build for
+arm64, so an arm64 system with an older glibc has no client to run.
+"""
+
+import pytest
+
+import flet_desktop
+
+
+@pytest.fixture
+def linux(monkeypatch):
+    monkeypatch.delenv("FLET_LINUX_DISTRO", raising=False)
+    monkeypatch.setattr(flet_desktop, "is_windows", lambda: False)
+    monkeypatch.setattr(flet_desktop, "is_macos", lambda: False)
+    monkeypatch.setattr(flet_desktop, "__get_desktop_flavor", lambda: "full")
+
+    def configure(arch, glibc):
+        monkeypatch.setattr(flet_desktop, "get_arch", lambda: arch)
+        monkeypatch.setattr(flet_desktop, "__get_system_glibc_version", lambda: glibc)
+
+    return configure
+
+
+@pytest.mark.parametrize(
+    "arch, glibc, filename",
+    [
+        ("amd64", (2, 28), "flet-linux-debian10-amd64.tar.gz"),
+        ("amd64", (2, 31), "flet-linux-ubuntu20.04-amd64.tar.gz"),
+        ("arm64", (2, 31), "flet-linux-ubuntu20.04-arm64.tar.gz"),
+        ("arm64", (2, 36), "flet-linux-debian12-arm64.tar.gz"),
+        ("arm64", (2, 41), "flet-linux-ubuntu24.04-arm64.tar.gz"),
+    ],
+)
+def test_picks_newest_build_the_system_can_run(linux, arch, glibc, filename):
+    linux(arch, glibc)
+    assert flet_desktop.get_artifact_filename() == filename
+
+
+def test_arm64_with_glibc_older_than_any_arm64_build_fails(linux):
+    linux("arm64", (2, 28))
+    with pytest.raises(RuntimeError, match=r"Linux arm64 requires glibc 2\.31"):
+        flet_desktop.get_artifact_filename()
+
+
+def test_undetected_glibc_falls_back_to_oldest_build_for_arch(linux):
+    linux("arm64", (0, 0))
+    assert flet_desktop.get_artifact_filename() == "flet-linux-ubuntu20.04-arm64.tar.gz"
+
+
+def test_architecture_without_builds_fails(linux):
+    linux("arm_7", (2, 36))
+    with pytest.raises(RuntimeError, match="not available for Linux arm_7"):
+        flet_desktop.get_artifact_filename()
+
+
+def test_flet_linux_distro_overrides_detection(linux, monkeypatch):
+    linux("arm64", (2, 28))
+    monkeypatch.setenv("FLET_LINUX_DISTRO", "debian10")
+    assert flet_desktop.get_artifact_filename() == "flet-linux-debian10-arm64.tar.gz"

flet_desktop-1.1.0.dev1/src/flet_desktop/version.py

@@ -1 +0,0 @@
-version = "1.1.0.dev1"

flet_desktop-1.1.0.dev1/src/flet_desktop.egg-info/requires.txt

@@ -1,2 +0,0 @@
-flet==1.1.0.dev1
-rich>=13.0.0