From dfc115f1d8d9c73570e06ab786bec21ff968b423 Mon Sep 17 00:00:00 2001
From: Phoenix / Hotaru <DeriousHD@gmail.com>
Date: Sat, 1 Jul 2023 21:48:57 +0100
Subject: [PATCH] Python 3.10.11 -> 3.11.4

---
 .github/workflows/actions.yml         | 10 +++++-----
 scripts/build.bat                     |  2 +-
 scripts/macos-universal2/prep-PyQt.sh |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 194407b..950d8b2 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v3
       with:
-        python-version: 3.10.11
+        python-version: 3.11.4
 
     # Windows Build
     - name: "Build"
@@ -65,11 +65,11 @@ jobs:
     - uses: actions/checkout@v3
 
     # MacOS Build
-    - name: "Install Python 3.10.11 and build NSO-RPC"
+    - name: "Install Python 3.11.4 and build NSO-RPC"
       run: |
-        curl https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg -o python-3.10.11-macos11.pkg
-        sudo installer -verbose -pkg python-3.10.11-macos11.pkg -target / &&
-        python3.10 -m pip install PyQt6 &&
+        curl https://www.python.org/ftp/python/3.11.4/python-3.11.4-macos11.pkg -o python-3.11.4-macos11.pkg
+        sudo installer -verbose -pkg python-3.11.4-macos11.pkg -target / &&
+        python3.11 -m pip install PyQt6 &&
         cd scripts/macos-universal2 &&
         bash ./build.sh &&
         python3 debloat-qt.py &&
diff --git a/scripts/build.bat b/scripts/build.bat
index a4a0135..bbdbd45 100644
--- a/scripts/build.bat
+++ b/scripts/build.bat
@@ -30,7 +30,7 @@ if "%PYQT_PACKAGE%"=="" (
 echo Building with %PYQT_PACKAGE%
 
 REM Install requirements
-python -m pip install -r ./requirements.txt pypiwin32 winshell pyinstaller==5.10.1 pyinstaller-hooks-contrib==2023.2
+python -m pip install -r ../client/requirements.txt pypiwin32 winshell pyinstaller>=5.12 pyinstaller-hooks-contrib==2023.4
 
 REM Build the executable using PyInstaller
 python -m PyInstaller --onefile --clean --noconsole --exclude-module autopep8 --noupx --add-data "*.png;." --icon=icon.ico --name=NSO-RPC ..\client\app.py
diff --git a/scripts/macos-universal2/prep-PyQt.sh b/scripts/macos-universal2/prep-PyQt.sh
index df47cbe..2688e89 100644
--- a/scripts/macos-universal2/prep-PyQt.sh
+++ b/scripts/macos-universal2/prep-PyQt.sh
@@ -2,7 +2,7 @@
 # Provided by @spotlightishere on Github
 # https://github.com/MCMi460/NSO-RPC/pull/86#issuecomment-1605700512
 
-alias python3=python3.10
+alias python3=python3.11
 
 # Download and unpack
 python3 -m pip download --only-binary=:all: --platform=macosx_13_0_x86_64 PyQt6_Qt6
@@ -28,5 +28,5 @@ export -f merge_frameworks
 find universal -perm +111 -type f -exec sh -c 'merge_frameworks "$1"' _ {} \;
 python3 -m wheel pack universal/PyQt6_*
 
-# Finally, install our universal python3.10 -m wheel.
+# Finally, install our universal python3.11 -m wheel.
 python3 -m pip install PyQt6_*universal2.whl --force-reinstall
\ No newline at end of file