Core: update modules

This commit is contained in:
Fabian Dill 2023-06-28 07:56:00 +02:00 committed by Fabian Dill
parent 4a60d8a4c1
commit 6a88d5aa79
3 changed files with 9 additions and 6 deletions

View File

@ -2254,12 +2254,15 @@ async def main(args: argparse.Namespace):
if not isinstance(e, ImportError):
logging.error(f"Failed to load tkinter ({e})")
logging.info("Pass a multidata filename on command line to run headless.")
exit(1)
# when cx_Freeze'd the built-in exit is not available, so we import sys.exit instead
import sys
sys.exit(1)
raise
if not data_filename:
logging.info("No file selected. Exiting.")
exit(1)
import sys
sys.exit(1)
try:
ctx.load(data_filename, args.use_embedded_options)

View File

@ -1,10 +1,10 @@
colorama>=0.4.5
websockets>=11.0.3
PyYAML>=6.0
jellyfish>=0.11.2
jellyfish>=1.0.0
jinja2>=3.1.2
schema>=0.7.5
kivy>=2.2.0
bsdiff4>=1.2.3
platformdirs>=3.5.1
platformdirs>=3.8.0
certifi>=2023.5.7

View File

@ -20,7 +20,7 @@ from pathlib import Path
# This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it
try:
requirement = 'cx-Freeze==6.14.9'
requirement = 'cx-Freeze>=6.15.2'
import pkg_resources
try:
pkg_resources.require(requirement)
@ -589,7 +589,7 @@ cx_Freeze.setup(
ext_modules=[], # required to disable auto-discovery with setuptools>=61
options={
"build_exe": {
"packages": ["websockets", "worlds", "kivy"],
"packages": ["worlds", "kivy"],
"includes": [],
"excludes": ["numpy", "Cython", "PySide2", "PIL",
"pandas"],