Skip to content

Commit

Permalink
Core: update modules
Browse files Browse the repository at this point in the history
  • Loading branch information
Berserker66 committed Jul 2, 2023
1 parent 4a60d8a commit 6a88d5a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
7 changes: 5 additions & 2 deletions MultiServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# 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)
Expand Down Expand Up @@ -589,7 +589,7 @@ def find_lib(lib, arch, libc):
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"],
Expand Down

0 comments on commit 6a88d5a

Please sign in to comment.