fix(packaging): bundle setuptools/_vendor for frozen pkg_resources
Setuptools 80+ pkg_resources imports jaraco.* and platformdirs after adding setuptools/_vendor to sys.path. PyInstaller onefile did not ship that tree, causing ModuleNotFoundError: jaraco at pyi_rth_pkgres. Include the full _vendor directory as datas; add platformdirs to hiddenimports. Applied to windows, linux, and macos specs. Made-with: Cursor
This commit is contained in:
parent
f28e4e3384
commit
57b686c841
|
|
@ -10,7 +10,13 @@ block_cipher = None
|
||||||
|
|
||||||
# customtkinter ships JSON themes + assets that must be bundled
|
# customtkinter ships JSON themes + assets that must be bundled
|
||||||
import customtkinter
|
import customtkinter
|
||||||
|
import setuptools
|
||||||
|
|
||||||
ctk_path = os.path.dirname(customtkinter.__file__)
|
ctk_path = os.path.dirname(customtkinter.__file__)
|
||||||
|
_vendor = os.path.join(os.path.dirname(setuptools.__file__), '_vendor')
|
||||||
|
_setuptools_vendor = (
|
||||||
|
[(_vendor, os.path.join('setuptools', '_vendor'))]
|
||||||
|
if os.path.isdir(_vendor) else [])
|
||||||
|
|
||||||
# Collect gi (PyGObject) submodules and data so pystray._appindicator works
|
# Collect gi (PyGObject) submodules and data so pystray._appindicator works
|
||||||
gi_hiddenimports = collect_submodules('gi')
|
gi_hiddenimports = collect_submodules('gi')
|
||||||
|
|
@ -26,7 +32,7 @@ a = Analysis(
|
||||||
[os.path.join(os.path.dirname(SPEC), os.pardir, 'linux.py')],
|
[os.path.join(os.path.dirname(SPEC), os.pardir, 'linux.py')],
|
||||||
pathex=[],
|
pathex=[],
|
||||||
binaries=[],
|
binaries=[],
|
||||||
datas=[(ctk_path, 'customtkinter/')] + gi_datas + typelib_datas,
|
datas=[(ctk_path, 'customtkinter/')] + _setuptools_vendor + gi_datas + typelib_datas,
|
||||||
hiddenimports=[
|
hiddenimports=[
|
||||||
'pystray._appindicator',
|
'pystray._appindicator',
|
||||||
'PIL._tkinter_finder',
|
'PIL._tkinter_finder',
|
||||||
|
|
@ -35,6 +41,7 @@ a = Analysis(
|
||||||
'cryptography.hazmat.primitives.ciphers.algorithms',
|
'cryptography.hazmat.primitives.ciphers.algorithms',
|
||||||
'cryptography.hazmat.primitives.ciphers.modes',
|
'cryptography.hazmat.primitives.ciphers.modes',
|
||||||
'cryptography.hazmat.backends.openssl',
|
'cryptography.hazmat.backends.openssl',
|
||||||
|
'platformdirs',
|
||||||
'gi',
|
'gi',
|
||||||
'_gi',
|
'_gi',
|
||||||
'gi.repository.GLib',
|
'gi.repository.GLib',
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,18 @@ import os
|
||||||
|
|
||||||
block_cipher = None
|
block_cipher = None
|
||||||
|
|
||||||
|
import setuptools
|
||||||
|
|
||||||
|
_vendor = os.path.join(os.path.dirname(setuptools.__file__), '_vendor')
|
||||||
|
_macos_datas = (
|
||||||
|
[(_vendor, os.path.join('setuptools', '_vendor'))]
|
||||||
|
if os.path.isdir(_vendor) else [])
|
||||||
|
|
||||||
a = Analysis(
|
a = Analysis(
|
||||||
[os.path.join(os.path.dirname(SPEC), os.pardir, 'macos.py')],
|
[os.path.join(os.path.dirname(SPEC), os.pardir, 'macos.py')],
|
||||||
pathex=[],
|
pathex=[],
|
||||||
binaries=[],
|
binaries=[],
|
||||||
datas=[],
|
datas=_macos_datas,
|
||||||
hiddenimports=[
|
hiddenimports=[
|
||||||
'rumps',
|
'rumps',
|
||||||
'objc',
|
'objc',
|
||||||
|
|
@ -21,6 +28,7 @@ a = Analysis(
|
||||||
'cryptography.hazmat.primitives.ciphers.algorithms',
|
'cryptography.hazmat.primitives.ciphers.algorithms',
|
||||||
'cryptography.hazmat.primitives.ciphers.modes',
|
'cryptography.hazmat.primitives.ciphers.modes',
|
||||||
'cryptography.hazmat.backends.openssl',
|
'cryptography.hazmat.backends.openssl',
|
||||||
|
'platformdirs',
|
||||||
],
|
],
|
||||||
hookspath=[],
|
hookspath=[],
|
||||||
hooksconfig={},
|
hooksconfig={},
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,21 @@ block_cipher = None
|
||||||
|
|
||||||
# customtkinter ships JSON themes + assets that must be bundled
|
# customtkinter ships JSON themes + assets that must be bundled
|
||||||
import customtkinter
|
import customtkinter
|
||||||
|
import setuptools
|
||||||
|
|
||||||
ctk_path = os.path.dirname(customtkinter.__file__)
|
ctk_path = os.path.dirname(customtkinter.__file__)
|
||||||
|
# pkg_resources (pyi_rth_pkgres) prepends setuptools/_vendor to sys.path and
|
||||||
|
# imports jaraco.* from there; frozen builds need the tree on disk.
|
||||||
|
_vendor = os.path.join(os.path.dirname(setuptools.__file__), '_vendor')
|
||||||
|
_bundle_datas = [(ctk_path, 'customtkinter/')]
|
||||||
|
if os.path.isdir(_vendor):
|
||||||
|
_bundle_datas.append((_vendor, os.path.join('setuptools', '_vendor')))
|
||||||
|
|
||||||
a = Analysis(
|
a = Analysis(
|
||||||
[os.path.join(os.path.dirname(SPEC), os.pardir, 'windows.py')],
|
[os.path.join(os.path.dirname(SPEC), os.pardir, 'windows.py')],
|
||||||
pathex=[],
|
pathex=[],
|
||||||
binaries=[],
|
binaries=[],
|
||||||
datas=[(ctk_path, 'customtkinter/')],
|
datas=_bundle_datas,
|
||||||
hiddenimports=[
|
hiddenimports=[
|
||||||
'pystray._win32',
|
'pystray._win32',
|
||||||
'PIL._tkinter_finder',
|
'PIL._tkinter_finder',
|
||||||
|
|
@ -22,6 +30,7 @@ a = Analysis(
|
||||||
'cryptography.hazmat.primitives.ciphers.algorithms',
|
'cryptography.hazmat.primitives.ciphers.algorithms',
|
||||||
'cryptography.hazmat.primitives.ciphers.modes',
|
'cryptography.hazmat.primitives.ciphers.modes',
|
||||||
'cryptography.hazmat.backends.openssl',
|
'cryptography.hazmat.backends.openssl',
|
||||||
|
'platformdirs',
|
||||||
],
|
],
|
||||||
hookspath=[],
|
hookspath=[],
|
||||||
hooksconfig={},
|
hooksconfig={},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue