diff --git a/build_scripts/pyinstaller.spec b/build_scripts/pyinstaller.spec index ef7e3bbcd46f..43693057a5d2 100644 --- a/build_scripts/pyinstaller.spec +++ b/build_scripts/pyinstaller.spec @@ -13,37 +13,6 @@ THIS_IS_MAC = platform.system().lower().startswith("darwin") ROOT = pathlib.Path(importlib.import_module("chia").__file__).absolute().parent.parent -def solve_name_collision_problem(analysis): - """ - There is a collision between the `chia` file name (which is the executable) - and the `chia` directory, which contains non-code resources like `english.txt`. - We move all the resources in the zipped area so there is no - need to create the `chia` directory, since the names collide. - - Fetching data now requires going into a zip file, so it will be slower. - It's best if files that are used frequently are cached. - - A sample large compressible file (1 MB of `/dev/zero`), seems to be - about eight times slower. - - Note that this hack isn't documented, but seems to work. - """ - - zipped = [] - datas = [] - for data in analysis.datas: - if str(data[0]).startswith("chia/"): - zipped.append(data) - else: - datas.append(data) - - # items in this field are included in the binary - analysis.zipped_data = zipped - - # these items will be dropped in the root folder uncompressed - analysis.datas = datas - - keyring_imports = collect_submodules("keyring.backends") # keyring uses entrypoints to read keyring.backends from metadata file entry_points.txt. @@ -176,8 +145,6 @@ def add_binary(name, path_to_script, collect_args): noarchive=False, ) - solve_name_collision_problem(analysis) - binary_pyz = PYZ(analysis.pure, analysis.zipped_data, cipher=block_cipher) binary_exe = EXE( diff --git a/setup.py b/setup.py index c3407768163f..8a4dfe35c6c3 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ dev_dependencies = [ "black==23.12.1", "lxml==4.9.3", "aiohttp_cors==0.7.0", # For blackd - "pyinstaller==5.13.0", + "pyinstaller==6.3.0", "types-aiofiles==23.2.0.0", "types-cryptography==3.3.23.2", "types-pyyaml==6.0.12.12",