From 6d3538a35ba8e6dff614cacb8a64970465658127 Mon Sep 17 00:00:00 2001 From: black-sliver <59490463+black-sliver@users.noreply.github.com> Date: Sat, 28 May 2022 23:20:46 +0200 Subject: [PATCH] AppImage: fix build (#589) * CI: build: use ARCH= for AppImage * WebHost: pin flask-caching until https://github.com/pallets-eco/flask-caching/pull/352 is merged or fixed otherwise --- WebHostLib/requirements.txt | 2 +- setup.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WebHostLib/requirements.txt b/WebHostLib/requirements.txt index ea1e27f6..258fa423 100644 --- a/WebHostLib/requirements.txt +++ b/WebHostLib/requirements.txt @@ -1,7 +1,7 @@ flask>=2.1.2 pony>=0.7.16 waitress>=2.1.1 -flask-caching>=1.10.1 +flask-caching==1.10.1 Flask-Compress>=1.12 Flask-Limiter>=2.4.5.1 bokeh>=2.4.3 \ No newline at end of file diff --git a/setup.py b/setup.py index 3124f4de..fb466c8f 100644 --- a/setup.py +++ b/setup.py @@ -321,6 +321,7 @@ $APPDIR/$exe "$@" self.app_id = self.app_name.lower() def run(self): + import platform self.dist_file.parent.mkdir(parents=True, exist_ok=True) if self.app_dir.is_dir(): shutil.rmtree(self.app_dir) @@ -333,7 +334,7 @@ $APPDIR/$exe "$@" self.write_desktop() self.write_launcher(self.app_exec) print(f'{self.app_dir} -> {self.dist_file}') - subprocess.call(f'./appimagetool -n "{self.app_dir}" "{self.dist_file}"', shell=True) + subprocess.call(f'ARCH={platform.machine()} ./appimagetool -n "{self.app_dir}" "{self.dist_file}"', shell=True) cx_Freeze.setup(