Update appimage build to include fontconfig and fix lib placement

Author: frmdstryr

main.py

@@ -9,8 +9,8 @@
 
 @author: jrm
 """
+
 from declaracad import main
-        
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

makefile

@@ -2,15 +2,15 @@ docs:
 	cd docs
 	make html
 isort:
-	isort --profile=black declaracad tests
+	isort --profile=black declaracad tests *.py
 typecheck:
 	mypy declaracad tests --ignore-missing-imports
 lintcheck:
-	flake8 --ignore=E501,E203,W503 declaracad tests
+	flake8 --ignore=E501,E203,W503 declaracad tests *.py
 reformat:
-	black declaracad tests
-	clang-format -i src/*.cpp
-	clang-format -i src/*.h
+	black declaracad tests *.py
+	#clang-format -i src/*.cpp
+	#clang-format -i src/*.h
 test:
 	pytest -v tests --cov declaracad --cov-report xml --asyncio-mode auto
 cleancache:

release.py

@@ -9,31 +9,53 @@
 
 @author
 """
+
+import importlib
 import os
 import sys
+from glob import glob
+from os.path import dirname
+from pathlib import Path
+
 import enaml
-import importlib
+from cx_Freeze import Executable, hooks, setup
+from cx_Freeze.hooks.qthooks import (
+    IS_WINDOWS,
+    QtHook,
+    _get_qt_files,
+    _qt_implementation,
+)
+
 import declaracad
-import shutil
-from pathlib import Path
-from glob import glob
-from os.path import dirname, split, exists
-from cx_Freeze import hooks, setup, Executable
+
+
+def patch_cx_freeze():
+    # Patch to fix all libs getting placed in the PySide6 folder
+    if IS_WINDOWS:
+        return
+
+    def qt_qtcore_patched(self, finder, module) -> None:
+        """Include plugins for the module."""
+        name = _qt_implementation(module)
+        for source, target in _get_qt_files(name, "LibrariesPath", "libQt*.so*"):
+            finder.lib_files.setdefault(source, target.as_posix())
+
+    QtHook.qt_qtcore = qt_qtcore_patched
 
 
 def load_declaracad(finder, module):
     import OCCT
 
     root = dirname(dirname(dirname(OCCT.__path__[0])))
-    if sys.platform == 'win32':
-        root = os.path.join(root, 'Library', 'lib')
+    if sys.platform == "win32":
+        root = os.path.join(root, "Library", "lib")
 
-    if sys.platform == 'win32':
-        patterns = ['*.lib']
-    elif sys.platform == 'darwin':
-        patterns = ['*.dylib']
+    if sys.platform == "win32":
+        patterns = ["*.lib"]
+    elif sys.platform == "darwin":
+        patterns = ["*.dylib"]
     else:
-        patterns = ['*.so*']
+        patterns = ["*.so*"]
 
     # Keep all libraries in venv/lib
     for pattern in patterns:
@@ -42,22 +64,22 @@ def load_declaracad(finder, module):
             finder.lib_files.setdefault(source, target)
     finder.include_module("declaracad")
 
+
 # Normal import does not work
 hooks.load_declaracad = load_declaracad
 
 
 def find_enaml_files(*modules):
-    """ Find .enaml files to include in the zip """
+    """Find .enaml files to include in the zip"""
     files = {}
     for name in modules:
         mod = importlib.import_module(name)
         mod_path = dirname(mod.__file__)
         pkg_root = dirname(mod_path)
 
-        for file_type in ['enaml', 'png']:
-            for f in glob('{}/**/*.{}'.format(mod_path, file_type),
-                          recursive=True):
-                pkg = f.replace(pkg_root+os.path.sep, '')
+        for file_type in ["enaml", "png"]:
+            for f in glob("{}/**/*.{}".format(mod_path, file_type), recursive=True):
+                pkg = f.replace(pkg_root + os.path.sep, "")
                 files[f] = pkg
 
     return files.items()
@@ -66,103 +88,149 @@ def find_enaml_files(*modules):
 def find_data_files(*modules):
     files = {}
     for name in modules:
-        mod = importlib.import_module(name)
         mod_path = name
         pkg_root = name
 
-        for f in glob('{}/**/*.png'.format(mod_path), recursive=True):
-            pkg = f.replace(pkg_root+os.path.sep, '')
+        for f in glob("{}/**/*.png".format(mod_path), recursive=True):
+            pkg = f.replace(pkg_root + os.path.sep, "")
             files[f] = pkg
     return files.items()
 
 
-is_windows = sys.platform == 'win32'
+def find_fonts() -> list[tuple[str, str]]:
+    # Include font config on linux
+    if IS_WINDOWS or "CONDA_PREFIX" not in os.environ:
+        return []
+    etc_dir = os.path.join(os.environ["CONDA_PREFIX"], "etc")
+    return [(os.path.join(etc_dir, "fonts"), "etc/fonts")]
+
 
+patch_cx_freeze()
 with enaml.imports():
     setup(
-        name='declaracad',
+        name="declaracad",
         author="CodeLV",
         author_email="frmdstryr@gmail.com",
-        license='GPLv3',
-        url='https://github.com/codelv/declaracad/',
+        license="GPLv3",
+        url="https://github.com/codelv/declaracad/",
         description="A declarative parametric 3D modeling application",
         long_description=open("README.md").read(),
         version=declaracad.version,
         options=dict(
             build_exe=dict(
                 packages=[
-                    'declaracad',
-                    'enaml',
-                    'enamlx',
-                    "parso",  "jedi", # Needed outsize of zip for autocomplete to work
-                    'markdown',
-                    'html.parser',
-                    'pygments',
-                    'ipykernel',
-                    'zmq.utils.garbage', # Needed for embedded qt console
+                    "declaracad",
+                    "enaml",
+                    "enamlx",
+                    "parso",
+                    "jedi",  # Needed outsize of zip for autocomplete to work
+                    "markdown",
+                    "html.parser",
+                    "pygments",
+                    "ipykernel",
+                    "zmq.utils.garbage",  # Needed for embedded qt console
                 ],
+                include_files=find_fonts(),
                 zip_include_packages=[
-                    'asttokens',
-                    'asyncqtpy',
-                    'asyncio',
-                    'attr',
-                    'backcall',
-                    'bytecode',
-                    'curses', 'chardet', 'collections', 'concurrent', 'ctypes',
-                    'colorama', 'comm',
-                    'dateutil', 'distutils', 'docutils',
-                    'email',
-                    'executing',
-                    'encodings',
-                    'ezdxf',
-                    'http', 'html', 'fontTools',
-                    'IPython', 'ipython_genutils', 'ipykernel',
-                    'importlib', 'importlib_metadata',
-                    'json', 'jsonpickle', 'jupyter_client', 'jupyter_core',
-                    'jinja2',
-                    'logging',
-                    'numpydoc',
-                    'multiprocessing', 'markdown',
-                    'pathlib', 'pdf4py', 'pygments',  'pluggy', 'prompt_toolkit', 'packaging',
-                    'pytz', 'pydoc_data', 'pycparser', 'ptyprocess', 'pkg_resources', 'platformdirs',
-                    'pyparsing',
-                    'qtpy', 'qtconsole',
-                    're',
-                    'sqlite3', 'sphinx', 'serial', 'scipy', 'stack_data', 'sysconfig',
-                    'traitlets', 'tornado', 'toml', 'test', 'tomlib',
-                    'unittest', 'urllib',
-                    'wcwidth',
-                    'zipfile',
-                    'xml', 'xmlrpc',
-                    '_distutils_hack',
+                    "asttokens",
+                    "asyncqtpy",
+                    "asyncio",
+                    "attr",
+                    "backcall",
+                    "bytecode",
+                    "curses",
+                    "chardet",
+                    "collections",
+                    "concurrent",
+                    "ctypes",
+                    "colorama",
+                    "comm",
+                    "dateutil",
+                    "distutils",
+                    "docutils",
+                    "email",
+                    "executing",
+                    "encodings",
+                    "ezdxf",
+                    "http",
+                    "html",
+                    "fontTools",
+                    "IPython",
+                    "ipython_genutils",
+                    "ipykernel",
+                    "importlib",
+                    "importlib_metadata",
+                    "json",
+                    "jsonpickle",
+                    "jupyter_client",
+                    "jupyter_core",
+                    "jinja2",
+                    "logging",
+                    "numpydoc",
+                    "multiprocessing",
+                    "markdown",
+                    "pathlib",
+                    "pdf4py",
+                    "pygments",
+                    "pluggy",
+                    "prompt_toolkit",
+                    "packaging",
+                    "pytz",
+                    "pydoc_data",
+                    "pycparser",
+                    "ptyprocess",
+                    "pkg_resources",
+                    "platformdirs",
+                    "pyparsing",
+                    "qtpy",
+                    "qtconsole",
+                    "re",
+                    "sqlite3",
+                    "sphinx",
+                    "serial",
+                    "scipy",
+                    "stack_data",
+                    "sysconfig",
+                    "traitlets",
+                    "tornado",
+                    "toml",
+                    "test",
+                    "tomlib",
+                    "unittest",
+                    "urllib",
+                    "wcwidth",
+                    "zipfile",
+                    "xml",
+                    "xmlrpc",
+                    "_distutils_hack",
                 ],
-                zip_includes=find_enaml_files('enaml'),
+                zip_includes=find_enaml_files("enaml"),
                 excludes=[
-                    'alabaster',
-                    'babel',
-                    'wx',
-                    'tkinter',
-                    'matplotlib', 'matplotlib_inline',
-                    'lib2to3',
-                    'enamlx.qt.qt_occ_viewer',
-                    'zmq.eventloop.minitornado',
-                    'sphinx',
-                    'vtkmodules',
-                    'wheel'
-                    'debugpy',
+                    "alabaster",
+                    "babel",
+                    "wx",
+                    "tkinter",
+                    "matplotlib",
+                    "matplotlib_inline",
+                    "lib2to3",
+                    "enamlx.qt.qt_occ_viewer",
+                    "zmq.eventloop.minitornado",
+                    "sphinx",
+                    "vtkmodules",
+                    "wheel" "debugpy",
                 ],
             )
         ),
         executables=[
             Executable(
-                'main.py',
+                "main.py",
                 base="gui",
-                icon='declaracad/res/icons/logo.' + ('ico' if is_windows else 'png'),
-                target_name='declaracad',
-                shortcut_name="DeclaraCAD" if is_windows else None,
-                shortcut_dir="DesktopFolder" if is_windows else None,
+                icon="declaracad/res/icons/logo." + ("ico" if IS_WINDOWS else "png"),
+                target_name="declaracad",
+                shortcut_name="DeclaraCAD" if IS_WINDOWS else None,
+                shortcut_dir="DesktopFolder" if IS_WINDOWS else None,
                 # stdout doesn't
                 # base='Win32GUI' is_windows else None
             )
-        ]
+        ],
     )

setup.py

@@ -5,12 +5,14 @@
 The full license is in the file COPYING.txt, distributed with this software.
 Created on Dec 13, 2017
 """
+
 import os
 import re
 import sys
-from setuptools import setup, find_packages
 from glob import glob
 
+from setuptools import find_packages, setup
+
 try:
     from pybind11.setup_helpers import Pybind11Extension, build_ext
 except ImportError:
@@ -26,7 +28,7 @@
     "asyncqtpy",  # asyncio + qt
     "pyserial>=3.5",
     "lxml",
-    "pyqcodeeditor", # text editor
+    "pyqcodeeditor",  # text editor
     "ezdxf",
     "pdf4py",
 ]
@@ -44,6 +46,7 @@ def find_include(name: str) -> str:
     prefix = os.path.dirname(os.path.dirname(sys.executable))
     return os.path.join(prefix, "include", name)
 
+
 def find_lib(name: str) -> str:
     prefix = os.path.dirname(os.path.dirname(sys.executable))
     return os.path.join(prefix, "lib", name)
@@ -84,8 +87,8 @@ def find_pyocct():
             os.path.join(pyocct_dir, "src"),
         ],
         libraries=[
-            #"TKernel", "TKOpenGl", "TKVoxel"
-            #"Qt6Core",
+            # "TKernel", "TKOpenGl", "TKVoxel"
+            # "Qt6Core",
             "TKernel",
             "TKOpenGl",
             "Qt6Gui",