Reworked the PyInstaller Builds (#569)

* Reworked the pyinstaller.spec file

* Added workflow file for pyinstaller builds

Author: jmwright

.github/workflows/build.yml

@@ -0,0 +1,51 @@
+name: Build Executables
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            artifact: CQ-editor-linux-x86_64
+          - os: windows-latest
+            artifact: CQ-editor-windows-x86_64.exe
+          - os: macos-13
+            artifact: CQ-editor-macos-x86_64
+          - os: macos-latest
+            artifact: CQ-editor-macos-arm64
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install dependencies
+        run: |
+          pip install .
+          pip install pyinstaller
+
+      - name: Build executable
+        run: pyinstaller pyinstaller.spec
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}
+          path: dist/CQ-editor*
+
+      - name: Upload to release
+        if: github.event_name == 'release'
+        uses: softprops/action-gh-release@v2
+        with:
+          files: dist/CQ-editor*
+

pyinstaller.spec

@@ -1,60 +1,62 @@
 # -*- mode: python -*-
 
-import sys, site, os
-from path import Path
+import sys
+from pathlib import Path
+import parso
+from PyInstaller.utils.hooks import collect_data_files
 
 block_cipher = None
 
-spyder_data = Path(site.getsitepackages()[-1]) / 'spyder'
-parso_grammar = (Path(site.getsitepackages()[-1]) / 'parso/python').glob('grammar*')
-
+parso_grammar = (Path(parso.__file__).parent / 'python').glob('grammar*')
+
+a = Analysis(
+    ['run.py'],
+    pathex=['.'],
+    binaries=[],
+    datas=[
+        ('cq_editor/icons_res.py', 'cq_editor'),
+        *[(str(p), 'parso/python') for p in parso_grammar],
+        *collect_data_files('debugpy'),
+    ],
+    hiddenimports=[
+        'ipykernel.datapub',
+        'pygments.styles.default',
+        'qtconsole.client',
+        'OCP',
+    ],
+    hookspath=[],
+    runtime_hooks=[
+        'pyinstaller/pyi_rth_fontconfig.py',
+    ],
+    excludes=['_tkinter', 'spyder'],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
+
+# Exclude problemmatic Linux system libraries
 if sys.platform == 'linux':
-    occt_dir = os.path.join(Path(sys.prefix), 'share', 'opencascade')
-    ocp_path = (os.path.join(HOMEPATH, 'OCP.cpython-38-x86_64-linux-gnu.so'), '.')
-elif sys.platform == 'darwin':
-    occt_dir = os.path.join(Path(sys.prefix), 'share', 'opencascade')
-    ocp_path = (os.path.join(HOMEPATH, 'OCP.cpython-38-darwin.so'), '.')
-elif sys.platform == 'win32':
-    occt_dir = os.path.join(Path(sys.prefix), 'Library', 'share', 'opencascade')
-    ocp_path = (os.path.join(HOMEPATH, 'OCP.cp38-win_amd64.pyd'), '.')
-
-a = Analysis(['run.py'],
-             pathex=['.'],
-             binaries=[ocp_path],
-             datas=[(spyder_data, 'spyder'),
-                    (occt_dir, 'opencascade')] +
-                    [(p, 'parso/python') for p in parso_grammar],
-             hiddenimports=['ipykernel.datapub'],
-             hookspath=[],
-             runtime_hooks=['pyinstaller/pyi_rth_occ.py',
-                            'pyinstaller/pyi_rth_fontconfig.py'],
-             excludes=['_tkinter',],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          [],
-          exclude_binaries=True,
-          name='CQ-editor',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          console=True,
-          icon='icons/cadquery_logo_dark.ico')
-
-exclude = ('libGL','libEGL','libbsd')
-a.binaries = TOC([x for x in a.binaries if not x[0].startswith(exclude)])
-
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='CQ-editor')
+    exclude_libs = ('libGL', 'libEGL', 'libbsd')
+    a.binaries = TOC(
+        [x for x in a.binaries if not x[0].startswith(exclude_libs)]
+    )
+
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    name='CQ-editor',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    console=False,
+    icon='icons/cadquery_logo_dark.ico',
+)
+