Update python, pyside, and pyinstaller

.github/workflows/python-app.yml

@@ -58,11 +58,11 @@ jobs:
         env:
           SEED_KEY: ${{ secrets.SEED_KEY }}
           BUILD_KEY: ${{ secrets.BUILD_KEY }}
-      - name: Set up Python 3.11
+      - name: Set up Python
         id: setup-py
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.12'
           check-latest: true
           architecture: ${{ matrix.architecture }}
           cache: 'pip' # Cache all pip dependency downloads

README.md

@@ -62,12 +62,12 @@ Download and install git from here: https://git-scm.com/downloads
 Then clone this repository with git by running this in a command prompt:  
 `git clone --recurse-submodules https://github.com/LagoLunatic/wwrando.git`  
 
-Download and install Python 3.11.5 from here: https://www.python.org/downloads/release/python-3115/  
+Download and install Python 3.12 from here: https://www.python.org/downloads/release/python-3121/  
 "Windows installer (64-bit)" is the one you want if you're on Windows, "macOS 64-bit universal2 installer" if you're on Mac.  
-If you're on Linux, run this command instead: `sudo apt-get install python3.11`  
+If you're on Linux, run this command instead: `sudo apt-get install python3.12`  
 
 Open the wwrando folder in a command prompt and install dependencies by running:  
-`py -3.11 -m pip install -r requirements.txt` (on Windows)  
+`py -3.12 -m pip install -r requirements.txt` (on Windows)  
 `python3 -m pip install -r requirements.txt` (on Mac)  
 `python3 -m pip install $(cat requirements.txt) --user` (on Linux)  
 

asm/assemble.bat

@@ -1 +1 @@
-py assemble.py
+py -3.12 assemble.py

asm/assemble.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3.11
+#!/usr/bin/python3
 
 import glob
 import re

build.bat

@@ -1,4 +1,4 @@
-py -3.11 -m PyInstaller --log-level=WARN wwrando.spec
+py -3.12 -m PyInstaller --log-level=WARN wwrando.spec
 if %errorlevel% neq 0 exit /b %errorlevel%
-py build.py
+py -3.12 build.py
 if %errorlevel% neq 0 exit /b %errorlevel%

build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3.11
+#!/usr/bin/python3
 
 import os
 import platform

keys/generate_key.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3.11
+#!/usr/bin/python3
 
 import secrets
 import sys

keys/generate_keys.bat

@@ -15,5 +15,3 @@ set /p key_4= < temp_key
 del temp_key
 
 echo SEED_KEY=str(0X%key_1%-(0X%key_2%+0X%key_3%)*0X%key_4%) > seed_key.py
-
-py generate_key.py 8 > build_key.txt

keys/generate_keys.sh

@@ -4,5 +4,3 @@ key_3=$(python generate_key.py)
 key_4=$(python generate_key.py)
 
 echo "SEED_KEY=str(0X$key_1-(0X$key_2+0X$key_3)*0X$key_4)" > seed_key.py
-
-python generate_key.py 8 > build_key.txt

requirements.txt

@@ -1,4 +1,4 @@
-PySide6==6.5.2
+PySide6~=6.6.0
 PyYAML==6.0.1
 Pillow==10.0.1
 appdirs==1.4.4

requirements_full.txt

@@ -1,9 +1,8 @@
-PySide6==6.5.2
+PySide6~=6.6.0
 PyYAML==6.0.1
 Pillow==10.0.1
 appdirs==1.4.4
 certifi==2023.7.22
-PyInstaller==5.13.0
-tinyaes==1.0.4
+PyInstaller~=6.2.0
 -r ./gclib/requirements_full.txt
 tqdm>=4.65.0

wwr_ui/build_ui.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3.11
+#!/usr/bin/python3
 
 from subprocess import call
 import glob

wwrando.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3.11
+#!/usr/bin/python3
 
 import sys
 sys.path.insert(0, "./gclib")

wwrando.spec

@@ -1,9 +1,6 @@
 # -*- mode: python -*-
 
-with open("./keys/build_key.txt") as f:
-  cipher_key = f.read().strip()
-
-block_cipher = pyi_crypto.PyiBlockCipher(key=cipher_key)
+block_cipher = None
 
 with open("./version.txt") as f:
   randomizer_version = f.read().strip()