From 3a2a089d2c9829421cf6035270109ff77f25bcac Mon Sep 17 00:00:00 2001
From: Loren Eteval <loren.eteval@proton.me>
Date: Tue, 24 Dec 2024 18:34:20 +0800
Subject: [PATCH] Update deploy-pypi to use Python 3.12

Signed-off-by: Loren Eteval <loren.eteval@proton.me>
---
 .github/workflows/deploy-pypi.yml | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/deploy-pypi.yml b/.github/workflows/deploy-pypi.yml
index d425da6..974c904 100644
--- a/.github/workflows/deploy-pypi.yml
+++ b/.github/workflows/deploy-pypi.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
           check-latest: true
 
       - name: Set up Python venv
@@ -25,6 +25,7 @@ jobs:
           python3 -m venv .venv
           source .venv/bin/activate
           python3 --version
+          python3 -m pip install --upgrade pip
 
       - name: Install libegl1
         run: |
@@ -84,8 +85,9 @@ jobs:
       matrix:
         os: [windows-2022, macos-13, macos-14]
     env:
+      # Last PySide6 version that supports macOS 10.9 + Python 3.11
       PYSIDE6_LEGACY_VERSION: "6.4.3"
-      PYSIDE6_TARGET_VERSION: "6.5.3"
+      PYSIDE6_TARGET_VERSION: "6.8.1"
 
     steps:
       - uses: actions/checkout@v4
@@ -93,7 +95,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
           check-latest: true
 
       - name: Set up Python venv
@@ -108,6 +110,7 @@ jobs:
             exit 1
           fi
           python3 --version
+          python3 -m pip install --upgrade pip
 
       - name: Install macOS dependencies
         run: |
@@ -125,16 +128,9 @@ jobs:
         run: |
           python3 -m pip install setuptools wheel
 
-      - name: Install specific PySide6-Essentials on OS
+      - name: Install PySide6-Essentials
         run: |
-          if [ "$RUNNER_OS" == "macOS" ]; then
-            python3 -m pip install PySide6-Essentials==$PYSIDE6_LEGACY_VERSION
-          elif [ "$RUNNER_OS" == "Windows" ]; then
-            python3 -m pip install PySide6-Essentials==$PYSIDE6_TARGET_VERSION
-          else
-            echo "$RUNNER_OS not supported"
-            exit 1
-          fi
+          python3 -m pip install PySide6-Essentials==$PYSIDE6_TARGET_VERSION
 
       - name: Install requirements.txt
         run: |
@@ -178,17 +174,6 @@ jobs:
       - name: Run deploy script
         run: python3 Deploy.py
 
-      - name: Upgrade PySide6-Essentials to target version if on macOS
-        run: |
-          python3 -m pip uninstall -y PySide6-Essentials shiboken6
-          python3 -m pip install PySide6-Essentials==$PYSIDE6_TARGET_VERSION
-        if: runner.os == 'macOS'
-
-      - name: Run deploy script again if on macOS
-        run: |
-          python3 Deploy.py
-        if: runner.os == 'macOS'
-
       - name: Store the distribution packages
         uses: actions/upload-artifact@v3
         with: