build(deps): update pyinstaller to v6.6, and set contents_directory='…

….' in aw.spec and submodules
ActivityWatch · May 6, 2024 · 13d957f · 13d957f
1 parent 98fcd71
commit 13d957f
Show file tree

Hide file tree

Showing 8 changed files with 204 additions and 158 deletions.
diff --git a/aw-notify b/aw-notify
diff --git a/aw-qt b/aw-qt
diff --git a/aw-server b/aw-server
diff --git a/aw-watcher-afk b/aw-watcher-afk
diff --git a/aw-watcher-window b/aw-watcher-window
diff --git a/aw.spec b/aw.spec
@@ -1,5 +1,6 @@
 # -*- mode: python -*-
 # vi: set ft=python :
+
 import os
 import platform
 import shlex
@@ -47,6 +48,7 @@ def build_collect(analysis, name, console=True):
         strip=False,
         upx=True,
         console=console,
+        contents_directory=".",
         entitlements_file=entitlements_file,
         codesign_identity=codesign_identity,
     )
@@ -149,14 +151,16 @@ aw_watcher_input_a = build_analysis("aw_watcher_input", awi_location)
 aw_watcher_window_a = build_analysis(
     "aw_watcher_window",
     aww_location,
-    binaries=[
-        (
-            aww_location / "aw_watcher_window/aw-watcher-window-macos",
-            "aw_watcher_window",
-        )
-    ]
-    if platform.system() == "Darwin"
-    else [],
+    binaries=(
+        [
+            (
+                aww_location / "aw_watcher_window/aw-watcher-window-macos",
+                "aw_watcher_window",
+            )
+        ]
+        if platform.system() == "Darwin"
+        else []
+    ),
     datas=[
         (aww_location / "aw_watcher_window/printAppStatus.jxa", "aw_watcher_window")
     ],

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ psutil = "*"
 pywin32-ctypes = {version = "*", platform = "win32"}
 pefile = {version = "*", platform = "win32"}
 
-pyinstaller = "^5.13"
+pyinstaller = "^6.6"
 # releases are very infrequent, so good idea to use the master branch
 # we need this unreleased commit: https://github.com/pyinstaller/pyinstaller-hooks-contrib/commit/0f40dc6e74086e5472aee75070b9077b4c17ab18
 pyinstaller-hooks-contrib = {git = "https://github.com/pyinstaller/pyinstaller-hooks-contrib.git", branch="master"}