Core: update modules
This commit is contained in:
parent
4a60d8a4c1
commit
6a88d5aa79
|
@ -2254,12 +2254,15 @@ async def main(args: argparse.Namespace):
|
||||||
if not isinstance(e, ImportError):
|
if not isinstance(e, ImportError):
|
||||||
logging.error(f"Failed to load tkinter ({e})")
|
logging.error(f"Failed to load tkinter ({e})")
|
||||||
logging.info("Pass a multidata filename on command line to run headless.")
|
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
|
raise
|
||||||
|
|
||||||
if not data_filename:
|
if not data_filename:
|
||||||
logging.info("No file selected. Exiting.")
|
logging.info("No file selected. Exiting.")
|
||||||
exit(1)
|
import sys
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
ctx.load(data_filename, args.use_embedded_options)
|
ctx.load(data_filename, args.use_embedded_options)
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
colorama>=0.4.5
|
colorama>=0.4.5
|
||||||
websockets>=11.0.3
|
websockets>=11.0.3
|
||||||
PyYAML>=6.0
|
PyYAML>=6.0
|
||||||
jellyfish>=0.11.2
|
jellyfish>=1.0.0
|
||||||
jinja2>=3.1.2
|
jinja2>=3.1.2
|
||||||
schema>=0.7.5
|
schema>=0.7.5
|
||||||
kivy>=2.2.0
|
kivy>=2.2.0
|
||||||
bsdiff4>=1.2.3
|
bsdiff4>=1.2.3
|
||||||
platformdirs>=3.5.1
|
platformdirs>=3.8.0
|
||||||
certifi>=2023.5.7
|
certifi>=2023.5.7
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -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
|
# This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it
|
||||||
try:
|
try:
|
||||||
requirement = 'cx-Freeze==6.14.9'
|
requirement = 'cx-Freeze>=6.15.2'
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
try:
|
try:
|
||||||
pkg_resources.require(requirement)
|
pkg_resources.require(requirement)
|
||||||
|
@ -589,7 +589,7 @@ cx_Freeze.setup(
|
||||||
ext_modules=[], # required to disable auto-discovery with setuptools>=61
|
ext_modules=[], # required to disable auto-discovery with setuptools>=61
|
||||||
options={
|
options={
|
||||||
"build_exe": {
|
"build_exe": {
|
||||||
"packages": ["websockets", "worlds", "kivy"],
|
"packages": ["worlds", "kivy"],
|
||||||
"includes": [],
|
"includes": [],
|
||||||
"excludes": ["numpy", "Cython", "PySide2", "PIL",
|
"excludes": ["numpy", "Cython", "PySide2", "PIL",
|
||||||
"pandas"],
|
"pandas"],
|
||||||
|
|
Loading…
Reference in New Issue