requirements: update cx-Freeze, fix compatibility
this conflicts with and replaces commit #f9b12b51080c7bbbf3d52c79453ac6c8222a03c5
This commit is contained in:
parent
fa3925cd74
commit
78f22e895e
8
setup.py
8
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
|
# This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it
|
||||||
import subprocess
|
import subprocess
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
requirement = 'cx-Freeze>=6.10'
|
requirement = 'cx-Freeze>=6.11'
|
||||||
try:
|
try:
|
||||||
pkg_resources.require(requirement)
|
pkg_resources.require(requirement)
|
||||||
import cx_Freeze
|
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.
|
# 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 = [
|
user_options = [
|
||||||
('yes', 'y', 'Answer "yes" to all questions.'),
|
('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
|
# Override cx_Freeze's build_exe command for pre and post build steps
|
||||||
class BuildExeCommand(cx_Freeze.dist.build_exe):
|
class BuildExeCommand(cx_Freeze.command.build_exe.BuildEXE):
|
||||||
user_options = cx_Freeze.dist.build_exe.user_options + [
|
user_options = cx_Freeze.command.build_exe.BuildEXE.user_options + [
|
||||||
('yes', 'y', 'Answer "yes" to all questions.'),
|
('yes', 'y', 'Answer "yes" to all questions.'),
|
||||||
('extra-data=', None, 'Additional files to add.'),
|
('extra-data=', None, 'Additional files to add.'),
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue