From 55b79aba508761ead28c4e117d8776359ad3a978 Mon Sep 17 00:00:00 2001 From: Izzie Walton Date: Mon, 13 May 2024 18:26:48 -0400 Subject: [PATCH] Attempt to fix pyinstaller 3. --- .github/workflows/main.yml | 8 ++++---- setup.py | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ccaee1e1dc..59e84c607b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,10 +9,10 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - name: Setup Python 3.11.2 + - name: Setup Python 3.9 uses: actions/setup-python@v5 with: - python-version: 3.11.2 + python-version: 3.9 - name: Install dependencies run: | curl -L https://github.com/shinchiro/mpv-winbuild-cmake/releases/download/20240513/mpv-dev-x86_64-20240513-git-61f72bd.7z > mpv.7z @@ -45,10 +45,10 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - name: Setup Python 3.11.2 + - name: Setup Python 3.9 uses: actions/setup-python@v5 with: - python-version: 3.11.2 + python-version: 3.9 - name: Install dependencies run: | curl -L https://github.com/shinchiro/mpv-winbuild-cmake/releases/download/20240513/mpv-dev-i686-20240513-git-61f72bd.7z > mpv.7z diff --git a/setup.py b/setup.py index 95c49f2cbe..eb0ea541e3 100644 --- a/setup.py +++ b/setup.py @@ -20,15 +20,20 @@ packages = [ "jellyfin_mpv_shim", "jellyfin_mpv_shim.display_mirror", - "jellyfin_mpv_shim.messages", - "jellyfin_mpv_shim.default_shader_pack", - "jellyfin_mpv_shim.default_shader_pack.shaders", - "jellyfin_mpv_shim.integration" + ] -for dir in os.listdir("jellyfin_mpv_shim/messages"): - if os.path.isdir("jellyfin_mpv_shim/messages/" + dir + "/LC_MESSAGES"): - packages.append("jellyfin_mpv_shim.messages." + dir + ".LC_MESSAGES") +if not sys.platform.startswith("win32"): + packages.extend([ + "jellyfin_mpv_shim.messages", + "jellyfin_mpv_shim.default_shader_pack", + "jellyfin_mpv_shim.default_shader_pack.shaders", + "jellyfin_mpv_shim.integration" + ]) + + for dir in os.listdir("jellyfin_mpv_shim/messages"): + if os.path.isdir("jellyfin_mpv_shim/messages/" + dir + "/LC_MESSAGES"): + packages.append("jellyfin_mpv_shim.messages." + dir + ".LC_MESSAGES") setup( name="jellyfin-mpv-shim",