Merge pull request #904 from gaphor/chore/pyinstaller-4.4

Upgrade PyInstaller to Version 4.4

.github/workflows/build.yml

@@ -216,25 +216,17 @@ jobs:
         run: make install
       - name: Test with Pytest
         run: make test-all
-      - name: Create macOS Application
-        run: |
-          make dist
-          cd packaging
-          make all
       - name: Import codesign certificate
         uses: apple-actions/import-codesign-certs@v1.0.4
         if: env.SECRETS_AVAILABLE != null && env.NOT_PR 
         with:
           p12-file-base64: ${{ secrets.BASE64_ENCODED_P12 }}
           p12-password: ${{ secrets.CERTPASSWORD_P12 }}
-      - name: Sign app
-        if: env.SECRETS_AVAILABLE != null && env.NOT_PR
-        run: >
+      - name: Create macOS Application
+        run: |
+          make dist
           cd packaging
-
-          codesign --sign "Developer ID Application: Daniel Yeaw (Z7V37BLNR9)"
-          --verbose --deep --timestamp --entitlements macos/entitlements.plist
-          -o runtime "dist/Gaphor.app"
+          make all
       - name: Notarize app
         uses: devbotsxyz/xcode-notarize@v1
         if: env.SECRETS_AVAILABLE != null && env.NOT_PR

packaging/Makefile

@@ -10,7 +10,7 @@ pyinstvenv:
 	python -m venv pyinstvenv
 	pyinstvenv/bin/pip install "../dist/gaphor-${VERSION}-py3-none-any.whl"
 	pyinstvenv/bin/pip install tomlkit
-	pyinstvenv/bin/pip install pyinstaller==4.3
+	pyinstvenv/bin/pip install pyinstaller==4.4
 
 windows/file_version_info.txt:
 	sed "s/__version__/${VERSION}/g" windows/file_version_info.txt.in > windows/file_version_info.txt

packaging/gaphor.spec.in

@@ -26,9 +26,8 @@ a = Analysis(
     + ui_files
     + copy_metadata("gaphor")
     + copy_metadata("gaphas"),
-    # Fixes issue with setuptools https://github.com/pypa/setuptools/issues/1963
-    hiddenimports=["pkg_resources.py2_warn"],
-    hookspath=["hooks"],
+    hiddenimports=[],
+    hookspath=[],
     runtime_hooks=[],
     excludes=["lib2to3", "tcl", "tk", "_tkinter", "tkinter", "Tkinter"],
     win_no_prefer_redirects=False,
@@ -50,6 +49,8 @@ exe = EXE(
     icon="windows/gaphor.ico",
     version="windows/file_version_info.txt",
     console=False,
+    codesign_identity="Developer ID Application: Daniel Yeaw (Z7V37BLNR9)",
+    entitlements_file="macos/entitlements.plist",
 )
 coll = COLLECT(
     exe, a.binaries, a.zipfiles, a.datas, strip=False, upx=True, name="gaphor"

packaging/hooks/hook-gi.repository.GtkosxApplication.py

@@ -1,5 +0,0 @@
-"""Import hook for PyGObject https://wiki.gnome.org/PyGObject."""
-
-from PyInstaller.utils.hooks import get_gi_typelibs
-
-binaries, datas, hiddenimports = get_gi_typelibs("GtkosxApplication", "1.0")

packaging/hooks/pre_safe_import_module/hook-gi.repository.GtkosxApplication.py

@@ -1,5 +0,0 @@
-def pre_safe_import_module(api):
-    # PyGObject modules loaded through the gi repository are marked as
-    # MissingModules by modulegraph so we convert them to
-    # RuntimeModules so their hooks are loaded and run.
-    api.add_runtime_module(api.module_name)