Merge branch 'future-2025-05' into develop

Author: hydrusnetwork

.github/workflows/release_linux.yml

@@ -17,7 +17,7 @@ jobs:
         name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
           architecture: x64
       -
         name: APT Install

.github/workflows/release_win.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build-windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       -
         name: Checkout
@@ -17,7 +17,7 @@ jobs:
         name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
           architecture: x64
       -
         name: Pip Install

pyproject.toml

@@ -86,8 +86,8 @@ other-future = [
 other-normal = [
 ]
 qt6-new = [
-    "pyside6==6.7.3",
-    "qtpy==2.4.1",
+    "pyside6==6.8.2.1",
+    "qtpy==2.4.3",
 ]
 qt6-new-pyqt6 = [
     "pyqt6",
@@ -99,6 +99,6 @@ qt6-older = [
     "qtpy==2.3.1",
 ]
 qt6-test = [
-    "pyside6==6.8.2.1",
+    "pyside6==6.9.0",
     "qtpy==2.4.3",
 ]

requirements.txt

@@ -29,5 +29,5 @@ twisted[tls,http2]>=20.3.0
 opencv-python-headless==4.10.0.84
 mpv==1.0.7
 
-QtPy==2.4.1
-PySide6==6.7.3
+QtPy==2.4.3
+PySide6==6.8.2.1

setup_venv.bat

@@ -88,7 +88,7 @@ IF EXIST "%venv_location%\" (
 :questions
 
 ECHO --------
-ECHO Users on older Windows need the advanced install. Python 3.13 will need the advanced install for newer '(t)est' Qt.
+ECHO Users on older Windows need the advanced install.
 ECHO:
 ECHO Your Python version is:
 %python_bin% --version
@@ -128,7 +128,7 @@ ECHO - For Python 3.11, your earliest available version is 6.4.0.1
 ECHO - For Python 3.12, your earliest available version is 6.6.0
 ECHO - For Python 3.13, your earliest available version is 6.8.0.2
 SET /P qt_custom_pyside6="Version: "
-SET /P qt_custom_qtpy="Enter the exact qtpy version you want (probably '2.4.1'; if older try '2.3.1'): "
+SET /P qt_custom_qtpy="Enter the exact qtpy version you want (probably '2.4.3'; if older try '2.3.1'): "
 
 :question_qt_custom_done
 :question_qt_advanced_done

setup_venv.command

@@ -50,7 +50,7 @@ if [ -d "venv" ]; then
 fi
 
 echo "--------"
-echo "If your macOS is old (Python 3.9), do the advanced install. Python 3.13 will need the advanced install for newer '(t)est' Qt."
+echo "If your macOS is old (Python 3.9), do the advanced install."
 echo
 echo "Your Python version is:"
 $py_command --version
@@ -94,7 +94,7 @@ elif [ "$install_type" = "a" ]; then
         echo "- For Python 3.13, your earliest available version is 6.8.0.2"
         echo "Version: "
         read -r qt_custom_pyside6
-        echo "Enter the exact qtpy version you want (probably '2.4.1'; if older try '2.3.1'): "
+        echo "Enter the exact qtpy version you want (probably '2.4.3'; if older try '2.3.1'): "
         read -r qt_custom_qtpy
     fi
 

setup_venv.sh

@@ -50,7 +50,7 @@ if [ -d "venv" ]; then
 fi
 
 echo "--------"
-echo "Users on older OSes need the advanced install. Python 3.13 will need the advanced install for newer '(t)est' Qt."
+echo "Users on older OSes need the advanced install."
 echo
 echo "Your Python version is:"
 $py_command --version
@@ -94,7 +94,7 @@ elif [ "$install_type" = "a" ]; then
         echo "- For Python 3.13, your earliest available version is 6.8.0.2"
         echo "Version: "
         read -r qt_custom_pyside6
-        echo "Enter the exact qtpy version you want (probably '2.4.1'; if older try '2.3.1'): "
+        echo "Enter the exact qtpy version you want (probably '2.4.3'; if older try '2.3.1'): "
         read -r qt_custom_qtpy
     fi
 

static/build_files/linux/requirements.txt

@@ -29,8 +29,8 @@ twisted[tls,http2]>=20.3.0
 opencv-python-headless==4.10.0.84
 mpv==1.0.7
 
-QtPy==2.4.1
-PySide6==6.7.3
+QtPy==2.4.3
+PySide6==6.8.2.1
 
 pyinstaller==6.7
 mkdocs-material

static/build_files/windows/requirements.txt

@@ -29,8 +29,8 @@ twisted[tls,http2]>=20.3.0
 opencv-python-headless==4.10.0.84
 mpv==1.0.7
 
-QtPy==2.4.1
-PySide6==6.7.3
+QtPy==2.4.3
+PySide6==6.8.2.1
 
 pyinstaller==6.7
 mkdocs-material

static/requirements/advanced/requirements_qt6_new.txt

@@ -1,2 +1,2 @@
-QtPy==2.4.1
-PySide6==6.7.3
+QtPy==2.4.3
+PySide6==6.8.2.1