[Misc] Rollback win32 to Py3.12, for prebuilt winsdk

.github/workflows/on_push.yml

@@ -2,13 +2,14 @@ name: Build & Test
 on: push
 
 jobs:
-  BuildExe:
+  build_exe:
+    name: Windows portable build
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
       - uses: pdm-project/setup-pdm@v4
         with:
-            python-version: 3.13
+            python-version: 3.12
             cache: true
       - name: Install Just
         run: choco install just
@@ -22,7 +23,8 @@ jobs:
           path: .\dist\*
           if-no-files-found: error
 
-  TestAndBuildDebian:
+  build_deb:
+    name: Run PyTest and build Debian package
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4

Vagrantfile

@@ -66,6 +66,8 @@ Vagrant.configure("2") do |config|
     win.vm.box = "gusztavvargadr/windows-11-24h2-enterprise"
     win.vm.synced_folder ".", "C:\\openfreebuds"
     win.vm.provider "vmware_desktop" do |v|
+      v.vmx["numvcpus"] = "4"
+      v.vmx["memsize"] = "4096"
       v.gui = true
     end
 
@@ -86,8 +88,8 @@ Vagrant.configure("2") do |config|
         winget install -e --accept-source-agreements --no-upgrade --id Casey.Just
         winget install -e --no-upgrade --id NSIS.NSIS
         winget install -e --no-upgrade --id UPX.UPX
-        winget install -e --no-upgrade --id Python.Python.3.13
-        winget install -e --no-upgrade --id Microsoft.VisualStudio.2022.BuildTools --override "--passive --wait --add Microsoft.VisualStudio.Workload.VCTools;includeRecommended"
+        winget install -e --no-upgrade --id Python.Python.3.12
+        # winget install -e --no-upgrade --id Microsoft.VisualStudio.2022.BuildTools --override "--passive --wait --add Microsoft.VisualStudio.Workload.VCTools;includeRecommended"
       SHELL
 
     win.vm.provision "shell",

justfile

@@ -4,7 +4,7 @@ set windows-shell := ["powershell.exe", "-c"]
 set script-interpreter := ["python"]
 
 # Tools
-pyside6_dir := `python -c "
+pyside6_dir := `pdm run python -c "
 import os
 try:
     import PySide6
@@ -65,6 +65,9 @@ test:
 prepare:
     pdm install
 
+vg_all:
+    vagrant halt -f
+    vagrant up --parallel
 
 
 # ------------------------------------------------
@@ -220,20 +223,20 @@ win32: win32_installer win32_portable
 [windows]
 win32_installer: win32_bundle
     New-Item -ItemType Directory -Force -Path ./dist
-    cd ./scripts/build_win32; makensis openfreebuds.nsi
-    mv ./scripts/build_win32/dist/openfreebuds.install.exe ./dist/openfreebuds_{{version}}_win32.exe
+    cd ./scripts; & "C:\Program Files (x86)\NSIS\Bin\makensis.exe" openfreebuds.nsi
+    mv -Force ./scripts/dist/openfreebuds.install.exe ./dist/openfreebuds_{{version}}_win32.exe
 
 # Make windows portable executable
 [windows]
 win32_portable:
     New-Item -ItemType Directory -Force -Path ./dist
-    cd ./scripts/build_win32; & pdm run pyinstaller openfreebuds_portable.spec
-    mv ./scripts/build_win32/dist/openfreebuds_portable.exe ./dist/openfreebuds_{{version}}_win32_portable.exe
+    cd ./scripts; & pdm run pyinstaller -y openfreebuds_portable.spec
+    mv -Force ./scripts/dist/openfreebuds_portable.exe ./dist/openfreebuds_{{version}}_win32_portable.exe
 
 # Prepare ./dist/ for win32 installer build
 [windows,private]
 win32_bundle:
-    cd ./scripts/build_win32; pdm run pyinstaller openfreebuds.spec
+    cd ./scripts; pdm run pyinstaller -y openfreebuds.spec
 
 
 

pyproject.toml

@@ -14,15 +14,17 @@ dependencies = [
     "qasync<1.0.0,>=0.27.1",
     "pynput<2.0.0,>=1.7.7",
     "pyqt6<7.0.0,>=6.7.1",
+    "dbus-next<1.0.0,>=0.2.3",
     "winsdk==1.0.0b10; sys_platform == 'win32'",
-    "dbus-next<1.0.0,>=0.2.3; sys_platform == 'linux'",
 ]
 
 [dependency-groups]
 dev = [
     "pytest<9.0.0,>=8.3.2",
     "pytest-asyncio<1.0.0,>=0.24.0",
     "pyinstaller==6.10.0; sys_platform == 'win32'",
+    # lrelease.exe provider
+    "pyside6>=6.8.2.1; sys_platform == 'win32'",
 ]
 no_flatpak = [
     "pyqt6<7.0.0,>=6.7.1",

scripts/.gitignore

@@ -0,0 +1,2 @@
+build
+dist

scripts/build_win32/openfreebuds.spec → scripts/openfreebuds.spec

@@ -5,18 +5,18 @@ block_cipher = None
 
 
 a = Analysis(
-    ["..\\..\\openfreebuds_qt\\launcher.py"],
+    ["..\\openfreebuds_qt\\launcher.py"],
     pathex=[],
     binaries=[],
     datas=[
-        ('..\\..\\openfreebuds\\assets', 'openfreebuds\\assets'),
-        ('..\\..\\openfreebuds_qt\\assets', 'openfreebuds_qt\\assets'),
+        ('..\\openfreebuds\\assets', 'openfreebuds\\assets'),
+        ('..\\openfreebuds_qt\\assets', 'openfreebuds_qt\\assets'),
     ],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],
-    excludes=[],
+    excludes=['PySide6'],
     win_no_prefer_redirects=False,
     win_private_assemblies=False,
     cipher=block_cipher,

scripts/build_win32/openfreebuds_portable.spec → scripts/openfreebuds_portable.spec

@@ -2,18 +2,18 @@
 
 
 a = Analysis(
-    ["..\\..\\openfreebuds_qt\\launcher.py"],
+    ["..\\openfreebuds_qt\\launcher.py"],
     pathex=[],
     binaries=[],
     datas=[
-        ('..\\..\\openfreebuds\\assets', 'openfreebuds\\assets'),
-        ('..\\..\\openfreebuds_qt\\assets', 'openfreebuds_qt\\assets'),
+        ('..\\openfreebuds\\assets', 'openfreebuds\\assets'),
+        ('..\\openfreebuds_qt\\assets', 'openfreebuds_qt\\assets'),
     ],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],
-    excludes=[],
+    excludes=['PySide6'],
     win_no_prefer_redirects=False,
     win_private_assemblies=False,
     noarchive=False,