From 73ffbcc09a0cc230d2ecc57064bc8435f448596e Mon Sep 17 00:00:00 2001 From: aokumasan Date: Wed, 22 May 2024 18:41:58 +0900 Subject: [PATCH 1/2] Bump cx-freeze to 6.15.16 --- Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 581f712..acda86b 100644 --- a/Pipfile +++ b/Pipfile @@ -9,7 +9,7 @@ nifcloud-cli = {editable = true, path = "."} [dev-packages] isort = "*" "flake8" = "*" -cx-freeze = "==6.15.0" +cx-freeze = "==6.15.16" sphinx = {version = "==5.3.0", sys_platform = "!= 'win32'"} sphinx-rtd-theme = {version = "*", sys_platform = "!= 'win32'"} pytest = "*" From ea1a7d89b9e9314ef9e2a0a91c076daadc3514a8 Mon Sep 17 00:00:00 2001 From: aokumasan Date: Wed, 22 May 2024 19:27:17 +0900 Subject: [PATCH 2/2] Fix cf-freeze build options Add upgrade_code to remove previous version before installing new one. --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 0bf7b39..0d27611 100644 --- a/setup.py +++ b/setup.py @@ -8,18 +8,18 @@ from cx_Freeze import Executable, setup from setuptools import find_packages - if 'bdist_msi' in sys.argv: - sys.argv += ['--add-to-path', 'True', '--skip-build'] - build_exe_options = { "includes": ["awscli", "html.parser"], "packages": ["docutils"], "excludes": ["awscli.examples", "botocore.data"], } - cx_freeze_opts = { + build_msi_options = { "add_to_path": True, "skip_build": True, - "options": {"build_exe": build_exe_options}, + "upgrade_code": "{799865ae-6f18-4e1a-a396-2ee83b6b46a8}", + } + cx_freeze_opts = { + "options": {"build_exe": build_exe_options, "bdist_msi": build_msi_options}, "executables": [Executable("bin/nifcloud", icon="assets/icon.ico")], } else: