From bd83c403a1eaeb7c7b665430c3ef9d2d1bc931df Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 29 Nov 2023 22:51:10 +0600 Subject: [PATCH] Fix spec file again --- .appveyor.yml | 7 +++---- pyfa.spec | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2633fe2a8..256a2453b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,14 +13,13 @@ for: APPIMAGE_TOOL: appimagetool-x86_64.AppImage PYTHON_APPIMAGE: python3.11.6-cp311-cp311-manylinux2014_x86_64.AppImage DEPLOY_DIR: AppDir/opt/pyfa -# APPVEYOR_SSH_BLOCK: true + # APPVEYOR_SSH_BLOCK: true cache: - /home/appveyor/.cache/pip -> requirements.txt init: - - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e - + # - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e - install: - sh: git fetch --prune --unshallow # to fix the version dump issues - - sh: sudo DEBIAN_FRONTEND=noninteractive sed -i '/postgres/d' /etc/apt/sources.list # As of 2023-11-14, postgres repo fail to update, but we don't need them anyway - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y update - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y install python3.11-dev libgtk-3-dev python3-pip libwebkit2gtk-4.0-dev before_build: @@ -41,7 +40,7 @@ for: - sh: AppDir/usr/bin/python -s -m pip install -U pip setuptools wheel pathlib2 - sh: AppDir/usr/bin/python -s -m pip install -r ../requirements.txt # Speedup, but causes runtime incompatiblities - #- sh: AppDir/usr/bin/python -s -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 -r ../requirements.txt + #- sh: AppDir/usr/bin/python -s -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 -r ../requirements.txt # Run scripts to prep pyfa data and build database - sh: cd ../ diff --git a/pyfa.spec b/pyfa.spec index 87abfcbcd..33fb64e0a 100644 --- a/pyfa.spec +++ b/pyfa.spec @@ -93,7 +93,7 @@ exe = EXE( icon= icon, # version='win-version-info.txt', console=False, - contents-directory='app', + contents_directory='app', ) coll = COLLECT(