mirror of
https://github.com/Chia-Network/chia-blockchain.git
synced 2024-10-05 15:56:54 +03:00
build(deps-dev): bump pyinstaller from 5.13.0 to 6.3.0 (#17051)
* build(deps-dev): bump pyinstaller from 5.13.0 to 6.3.0
Bumps [pyinstaller](https://github.com/pyinstaller/pyinstaller) from 5.13.0 to 6.3.0.
- [Release notes](https://github.com/pyinstaller/pyinstaller/releases)
- [Changelog](https://github.com/pyinstaller/pyinstaller/blob/develop/doc/CHANGES.rst)
- [Commits](https://github.com/pyinstaller/pyinstaller/compare/v5.13.0...v6.3.0)
---
updated-dependencies:
- dependency-name: pyinstaller
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* uses module paths instead of filesystem paths for pyinstaller data targets
* Revert "uses module paths instead of filesystem paths for pyinstaller data targets"
This reverts commit 279f81193a
.
* remove hack
* tidy
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kyle Altendorf <sda@fstab.net>
This commit is contained in:
parent
14160b17cc
commit
9c33f8c141
@ -13,37 +13,6 @@ THIS_IS_MAC = platform.system().lower().startswith("darwin")
|
|||||||
ROOT = pathlib.Path(importlib.import_module("chia").__file__).absolute().parent.parent
|
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_imports = collect_submodules("keyring.backends")
|
||||||
|
|
||||||
# keyring uses entrypoints to read keyring.backends from metadata file entry_points.txt.
|
# 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,
|
noarchive=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
solve_name_collision_problem(analysis)
|
|
||||||
|
|
||||||
binary_pyz = PYZ(analysis.pure, analysis.zipped_data, cipher=block_cipher)
|
binary_pyz = PYZ(analysis.pure, analysis.zipped_data, cipher=block_cipher)
|
||||||
|
|
||||||
binary_exe = EXE(
|
binary_exe = EXE(
|
||||||
|
2
setup.py
2
setup.py
@ -62,7 +62,7 @@ dev_dependencies = [
|
|||||||
"black==23.12.1",
|
"black==23.12.1",
|
||||||
"lxml==4.9.3",
|
"lxml==4.9.3",
|
||||||
"aiohttp_cors==0.7.0", # For blackd
|
"aiohttp_cors==0.7.0", # For blackd
|
||||||
"pyinstaller==5.13.0",
|
"pyinstaller==6.3.0",
|
||||||
"types-aiofiles==23.2.0.0",
|
"types-aiofiles==23.2.0.0",
|
||||||
"types-cryptography==3.3.23.2",
|
"types-cryptography==3.3.23.2",
|
||||||
"types-pyyaml==6.0.12.12",
|
"types-pyyaml==6.0.12.12",
|
||||||
|
Loading…
Reference in New Issue
Block a user