collect entrypoints

SoulMelody · Jun 11, 2024 · d1a9a1f · d1a9a1f
1 parent e8f09e4
commit d1a9a1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packaging/libresvip-web.spec b/packaging/libresvip-web.spec
@@ -10,7 +10,7 @@ sys.modules['FixTk'] = None
 
 import nicegui
 import shellingham
-from PyInstaller.utils.hooks import collect_data_files, collect_submodules
+from PyInstaller.utils.hooks import collect_data_files, collect_entry_point, collect_submodules
 from PyInstaller.utils.misc import is_win
 
 from libresvip.core.constants import pkg_dir
@@ -34,7 +34,7 @@ a = Analysis(
     datas=[
         (str(pkg_dir / "middlewares"), "libresvip/middlewares"),
         (str(pkg_dir / "plugins"), "libresvip/plugins"),
-    ] + collect_data_files("libresvip") + collect_data_files("nicegui") + collect_data_files("xsdata"),
+    ] + collect_data_files("libresvip") + collect_data_files("nicegui") + collect_data_files("xsdata") + collect_entry_point("xsdata.plugins.class_types")[0],
     hiddenimports=[
         "bidict",
         "construct_typed",
@@ -53,6 +53,7 @@ a = Analysis(
         "wanakana",
         "xsdata_pydantic.bindings",
         "xsdata_pydantic.fields",
+        "xsdata_pydantic.hooks.class_type",
         "zstandard",
     ] + collect_submodules("libresvip.core") + collect_submodules("libresvip.model") + collect_submodules("libresvip.utils"),
     hookspath=[],

diff --git a/packaging/libresvip.spec b/packaging/libresvip.spec
@@ -12,7 +12,7 @@ sys.modules['FixTk'] = None
 import libresvip
 import PySide6
 import shellingham
-from PyInstaller.utils.hooks import collect_data_files, collect_submodules
+from PyInstaller.utils.hooks import collect_data_files, collect_entry_point, collect_submodules
 from PyInstaller.utils.misc import is_win
 
 from libresvip.core.constants import pkg_dir
@@ -38,7 +38,7 @@ if not (is_win and platform.machine() == "ARM64"):
         datas=[
             (str(pkg_dir / "middlewares"), "libresvip/middlewares"),
             (str(pkg_dir / "plugins"), "libresvip/plugins"),
-        ] + collect_data_files("libresvip") + collect_data_files("xsdata"),
+        ] + collect_data_files("libresvip") + collect_data_files("xsdata") + collect_entry_point("xsdata.plugins.class_types")[0],
         hiddenimports=[
             "bidict",
             "construct_typed",
@@ -55,6 +55,8 @@ if not (is_win and platform.machine() == "ARM64"):
             "upath.implementations.memory",
             "wanakana",
             "xsdata_pydantic.bindings",
+            "xsdata_pydantic.fields",
+            "xsdata_pydantic.hooks.class_type",
             "zstandard",
         ] + collect_submodules("libresvip.core") + collect_submodules("libresvip.model") + collect_submodules("libresvip.utils"),
         hookspath=[],
@@ -123,7 +125,7 @@ gui_a = Analysis(
     datas=[
         (str(pkg_dir / "middlewares"), "libresvip/middlewares"),
         (str(pkg_dir / "plugins"), "libresvip/plugins"),
-    ] + collect_data_files("libresvip") + collect_data_files("desktop_notifier") + collect_data_files("fonticon_mdi7") + collect_data_files("xsdata"),
+    ] + collect_data_files("libresvip") + collect_data_files("desktop_notifier") + collect_data_files("fonticon_mdi7") + collect_data_files("xsdata") + collect_entry_point("xsdata.plugins.class_types")[0],
     hiddenimports=[
         "bidict",
         "construct_typed",
@@ -141,6 +143,7 @@ gui_a = Analysis(
         "wanakana",
         "xsdata_pydantic.bindings",
         "xsdata_pydantic.fields",
+        "xsdata_pydantic.hooks.class_type",
         "zstandard",
     ] + collect_submodules("libresvip.core") + collect_submodules("libresvip.model") + collect_submodules("libresvip.utils"),
     hookspath=[],