monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Setup: add setup specific requirements

This commit is contained in:
Fabian Dill 2022-01-22 20:35:30 +01:00
parent 66c15c8639
commit c7e87bc16a
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FactorioClient.py
View File

@ -308,8 +308,8 @@ async def main(args):
if sys.stdin: if sys.stdin:
input_task = asyncio.create_task(console_loop(ctx), name="Input") input_task = asyncio.create_task(console_loop(ctx), name="Input")
factorio_server_task = asyncio.create_task(factorio_spinup_server(ctx), name="FactorioSpinupServer") factorio_server_task = asyncio.create_task(factorio_spinup_server(ctx), name="FactorioSpinupServer")
succesful_launch = await factorio_server_task successful_launch = await factorio_server_task
if succesful_launch: if successful_launch:
factorio_server_task = asyncio.create_task(factorio_server_watcher(ctx), name="FactorioServer") factorio_server_task = asyncio.create_task(factorio_server_watcher(ctx), name="FactorioServer")
progression_watcher = asyncio.create_task( progression_watcher = asyncio.create_task(
game_watcher(ctx), name="FactorioProgressionWatcher") game_watcher(ctx), name="FactorioProgressionWatcher")

2
ModuleUpdate.py
View File

@ -38,7 +38,6 @@ def update(yes = False, force = False):
for line in requirementsfile: for line in requirementsfile:
if line.startswith('https://'): if line.startswith('https://'):
# extract name and version from url # extract name and version from url
url = line.split(';')[0]
wheel = line.split('/')[-1] wheel = line.split('/')[-1]
name, version, _ = wheel.split('-', 2) name, version, _ = wheel.split('-', 2)
line = f'{name}=={version}' line = f'{name}=={version}'
@ -58,6 +57,7 @@ def update(yes = False, force = False):
if __name__ == "__main__": if __name__ == "__main__":
import argparse import argparse
parser = argparse.ArgumentParser(description='Install archipelago requirements') parser = argparse.ArgumentParser(description='Install archipelago requirements')
parser.add_argument('-y', '--yes', dest='yes', action='store_true', help='answer "yes" to all questions') parser.add_argument('-y', '--yes', dest='yes', action='store_true', help='answer "yes" to all questions')
parser.add_argument('-f', '--force', dest='force', action='store_true', help='force update') parser.add_argument('-f', '--force', dest='force', action='store_true', help='force update')

10
setup.py
View File

@ -3,6 +3,16 @@ import shutil
import sys import sys
import sysconfig import sysconfig
from pathlib import Path from pathlib import Path
import ModuleUpdate
# I don't really want to have another root directory file for a single requirement, but this special case is also jank.
# Might move this into a cleaner solution when I think of one.
with open("freeze_requirements.txt", "w") as f:
f.write("cx-Freeze>=6.9\n")
ModuleUpdate.requirements_files.add("freeze_requirements.txt")
ModuleUpdate.requirements_files.add(os.path.join("WebHostLib", "requirements.txt"))
ModuleUpdate.update()
import cx_Freeze import cx_Freeze
from kivy_deps import sdl2, glew from kivy_deps import sdl2, glew
from Utils import version_tuple from Utils import version_tuple