From ae3fbcca77147cbfc59b555b9dfaa4b1419a96b8 Mon Sep 17 00:00:00 2001 From: Martin Hertz Date: Sun, 5 Jun 2022 18:40:11 +0200 Subject: [PATCH] [Packaging] Pinned Pyinstaller to v4.10 and readme update Pin Pyinstaller to latest v4.x until issue of aborting upon missing typelibs for various unbuilt gst-modules can be properly investigated and resolved. Specific error for one of the modules being: `36738 INFO: Loading module hook 'hook-gi.repository.Gst.py' from 'C:\\hostedtoolcache\\windows\\Python\\3.9.13\\x64\\lib\\site-packages\\PyInstaller\\hooks'... Traceback (most recent call last): File "", line 7, in gi.repository.GLib.GError: g-irepository-error-quark: Typelib file for namespace 'Gst', version '1.0' not found (0) 36870 ERROR: gi repository 'GIRepository 2.0' not found. Please make sure corresponding package is installed. Traceback (most recent call last): File "", line 4, in File "C:\hostedtoolcache\windows\Python\3.9.13\x64\lib\site-packages\gi\__init__.py", line 139, in require_version raise ValueError('Namespace %s not available' % namespace) ValueError: Namespace Gst not available` Added `--no-index` to ensure pip doesn't install from Pypi Closes: https://github.com/deluge-torrent/deluge/pull/386 --- .github/workflows/cd.yml | 4 ++-- packaging/win/README.md | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b56faeff4..35cd409c3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -71,12 +71,12 @@ jobs: - name: Install Python dependencies run: > - python -m pip install --find-links="C:\GTK\release\python" pycairo PyGObject + python -m pip install --no-index --find-links="C:\GTK\release\python" pycairo PyGObject python -m pip install twisted[tls]==22.4.0 libtorrent==${{ matrix.libtorrent }} - pyinstaller + pyinstaller==4.10 pygame -r requirements.txt diff --git a/packaging/win/README.md b/packaging/win/README.md index 4b9924cc4..272792c3f 100644 --- a/packaging/win/README.md +++ b/packaging/win/README.md @@ -11,13 +11,15 @@ Instructions for building the Deluge NSIS Installer for Windows Vista/7/8/8.1/10 == Build Steps == 1. Build and Install Deluge on Windows. -2. Run the pyinstaller from the deluge\packaging\win directory.spec: +2. Run pyinstaller from the deluge\packaging\win directory: - `pyinstaller --clean delugewin.spec --distpath .\packaging\win\freeze` + `pyinstaller --clean delugewin.spec --distpath freeze` The result is a PyInstaller version of Deluge in `packaging\win\freeze`. -3. Run the NSIS script: +3. Run the NSIS scripts: + + `python setup_nsis.py` 64-bit python: