Merge remote-tracking branch 'origin' into 26.05-picked

Author: abdnh

.github/actions/setup-anki/action.yml

@@ -88,13 +88,9 @@ runs:
           echo "UV_CACHE_DIR=$CACHE_DIR" >> "$GITHUB_ENV"
         fi
 
-    # UV_BINARY tells the build system to use our uv instead of downloading
-    # its own (see build/ninja_gen/src/python.rs). Linux-only because on
-    # macOS ARM the launcher needs the downloaded archive to build a universal
-    # binary via lipo (see build/configure/src/launcher.rs).
-    # On macOS/Windows, the downloaded uv will still use the shared cache.
-    - name: Set UV_BINARY (Linux)
-      if: runner.os == 'Linux'
+    # UV_BINARY tells the build system to use our uv instead of downloading its own
+    - name: Set UV_BINARY
+      if: runner.os != 'Windows'
       shell: bash
       run: echo "UV_BINARY=${{ steps.setup-uv.outputs.uv-path }}" >> "$GITHUB_ENV"
 

.github/scripts/sync_translations.py

@@ -27,8 +27,7 @@ def sync() -> None:
     check_clean()
     for module in modules:
         fetch_new_translations(module)
-        # FIXME: commented out to avoid pushing launcher.ftl for now
-        # push_new_templates(module)
+        push_new_templates(module)
     commit(".", "Update translations")
     push(".")
 

.github/workflows/release.yml

@@ -581,9 +581,6 @@ jobs:
       - name: Build wheels
         run: ./ninja wheels
 
-      - name: Build anki-release wheel
-        run: cd qt/release && bash build.sh
-
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4
         with:
           name: wheels-linux-x86

.vscode.dist/settings.json

@@ -35,9 +35,6 @@
     },
     "rust-analyzer.cargo.buildScripts.enable": true,
     "python.analysis.typeCheckingMode": "off",
-    "python.analysis.exclude": [
-        "out/launcher/**"
-    ],
     "terminal.integrated.env.windows": {
         "PATH": "c:\\msys64\\usr\\bin;${env:Path}"
     }

Cargo.lock

@@ -12,7 +12,6 @@ members = [
   "build/runner",
   "ftl",
   "pylib/rsbridge",
-  "qt/launcher",
   "rslib",
   "rslib/i18n",
   "rslib/io",
@@ -109,7 +108,7 @@ prost-build = "0.13"
 prost-reflect = "0.14.7"
 prost-types = "0.13"
 pulldown-cmark = "0.13.0"
-pyo3 = { version = "0.25.1", features = ["extension-module", "abi3", "abi3-py39"] }
+pyo3 = { version = "0.29.0", features = ["extension-module", "abi3", "abi3-py39"] }
 rand = "0.9.4"
 rayon = "1.10.0"
 regex = "1.11.1"

Cargo.toml

@@ -6,13 +6,10 @@
 This repo contains the source code for the computer version of
 [Anki](https://apps.ankiweb.net).
 
-# About
+## About
 
 Anki is a spaced repetition program. Please see the [website](https://apps.ankiweb.net) to learn more.
 
-This repo contains the source code for the computer version of
-[Anki](https://apps.ankiweb.net).
-
 ## Getting Started
 
 ### Contributing

README.md

@@ -5,7 +5,6 @@ mod aqt;
 mod audio;
 mod cog;
 mod installer;
-mod launcher;
 mod platform;
 mod pylib;
 mod python;
@@ -19,7 +18,6 @@ use aqt::build_and_check_aqt;
 use audio::build_audio;
 use cog::check_cog;
 use installer::build_installer;
-use launcher::build_launcher;
 use ninja_gen::glob;
 use ninja_gen::inputs;
 use ninja_gen::protobuf::check_proto;
@@ -61,7 +59,6 @@ fn main() -> Result<()> {
     build_and_check_aqt(build)?;
 
     if env::var("OFFLINE_BUILD").is_err() {
-        build_launcher(build)?;
         build_installer(build)?;
         build_audio(build)?;
     }

build/configure/src/launcher.rs

@@ -169,7 +169,7 @@ fn build_rsbridge(build: &mut Build) -> Result<()> {
 
 pub fn check_rust(build: &mut Build) -> Result<()> {
     let inputs = inputs![
-        glob!("{rslib/**,pylib/rsbridge/**,ftl/**,build/**,qt/launcher/**,tools/minilints/**}"),
+        glob!("{rslib/**,pylib/rsbridge/**,ftl/**,build/**,tools/minilints/**}"),
         "Cargo.lock",
         "Cargo.toml",
         "rust-toolchain.toml",