From 78f22e895e34c233461b3c6d1582b1149c048816 Mon Sep 17 00:00:00 2001 From: black-sliver <59490463+black-sliver@users.noreply.github.com> Date: Sat, 4 Jun 2022 19:21:37 +0200 Subject: [PATCH] requirements: update cx-Freeze, fix compatibility this conflicts with and replaces commit #f9b12b51080c7bbbf3d52c79453ac6c8222a03c5 --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 05da702a..9c8983bb 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ from Launcher import components, icon_paths # This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it import subprocess import pkg_resources -requirement = 'cx-Freeze>=6.10' +requirement = 'cx-Freeze>=6.11' try: pkg_resources.require(requirement) import cx_Freeze @@ -67,7 +67,7 @@ def _threaded_hash(filepath): # cx_Freeze's build command runs other commands. Override to accept --yes and store that. -class BuildCommand(cx_Freeze.dist.build): +class BuildCommand(cx_Freeze.command.build.Build): user_options = [ ('yes', 'y', 'Answer "yes" to all questions.'), ] @@ -84,8 +84,8 @@ class BuildCommand(cx_Freeze.dist.build): # Override cx_Freeze's build_exe command for pre and post build steps -class BuildExeCommand(cx_Freeze.dist.build_exe): - user_options = cx_Freeze.dist.build_exe.user_options + [ +class BuildExeCommand(cx_Freeze.command.build_exe.BuildEXE): + user_options = cx_Freeze.command.build_exe.BuildEXE.user_options + [ ('yes', 'y', 'Answer "yes" to all questions.'), ('extra-data=', None, 'Additional files to add.'), ]