From 706b63b079591e129d500147b2f4932017c581e4 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Tue, 7 Nov 2023 10:35:36 -0500
Subject: [PATCH 1/2] Increase minimal supported PyQt version to 5.10

This is necessary because we're using a functionality introduced in that
version.
---
 README.md              | 2 +-
 binder/environment.yml | 4 ++--
 requirements/main.yml  | 4 ++--
 setup.py               | 4 ++--
 spyder/requirements.py | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 5d51f73dd80..077888a74d2 100644
--- a/README.md
+++ b/README.md
@@ -207,7 +207,7 @@ a Python version equal or greater than 3.8.
 The basic dependencies to run Spyder are:
 
 * **Python** 3.8+: The core language Spyder is written in and for.
-* **PyQt5** 5.9+: Python bindings for Qt, used for Spyder's GUI.
+* **PyQt5** 5.10+: Python bindings for Qt, used for Spyder's GUI.
 
 The rest our dependencies (both required and optional) are declared in
 [this file](https://github.com/spyder-ide/spyder/blob/master/spyder/dependencies.py).
diff --git a/binder/environment.yml b/binder/environment.yml
index 394722eba04..e358266d09f 100644
--- a/binder/environment.yml
+++ b/binder/environment.yml
@@ -28,8 +28,8 @@ dependencies:
 - pylint >=2.5.0,<3.1
 - pylint-venv >=3.0.2
 - pyls-spyder >=0.4.0
-- pyqt <5.16
-- pyqtwebengine <5.16
+- pyqt >=5.10,<5.16
+- pyqtwebengine >=5.10,<5.16
 - python-lsp-black >=1.2.0,<3.0.0
 - python-lsp-server >=1.8.0,<1.9.0
 - pyxdg >=0.26
diff --git a/requirements/main.yml b/requirements/main.yml
index 0f0c856099e..659e181e056 100644
--- a/requirements/main.yml
+++ b/requirements/main.yml
@@ -26,8 +26,8 @@ dependencies:
   - pylint >=2.5.0,<3.1
   - pylint-venv >=3.0.2
   - pyls-spyder >=0.4.0
-  - pyqt <5.16
-  - pyqtwebengine <5.16
+  - pyqt >=5.10,<5.16
+  - pyqtwebengine >=5.10,<5.16
   - python-lsp-black >=1.2.0,<3.0.0
   - python-lsp-server >=1.8.0,<1.9.0
   - pyzmq >=22.1.0
diff --git a/setup.py b/setup.py
index e90ac3e4b56..3df893c1f62 100644
--- a/setup.py
+++ b/setup.py
@@ -230,8 +230,8 @@ def run(self):
     'pylint-venv>=3.0.2',
     'python-lsp-black>=1.2.0,<3.0.0',
     'pyls-spyder>=0.4.0',
-    'pyqt5<5.16',
-    'pyqtwebengine<5.16',
+    'pyqt5>=5.10,<5.16',
+    'pyqtwebengine>=5.10,<5.16',
     'python-lsp-server[all]>=1.8.0,<1.9.0',
     'pyxdg>=0.26;platform_system=="Linux"',
     'pyzmq>=22.1.0',
diff --git a/spyder/requirements.py b/spyder/requirements.py
index f80a637b7c8..c2094d3d7aa 100644
--- a/spyder/requirements.py
+++ b/spyder/requirements.py
@@ -31,7 +31,7 @@ def show_warning(message):
 
 def check_qt():
     """Check Qt binding requirements"""
-    qt_infos = dict(pyqt5=("PyQt5", "5.9"), pyside2=("PySide2", "5.12"))
+    qt_infos = dict(pyqt5=("PyQt5", "5.10"), pyside2=("PySide2", "5.12"))
     try:
         import qtpy
         package_name, required_ver = qt_infos[qtpy.API]

From c3d322be95db4d8dd981ca6981d12d29acb22664 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Tue, 7 Nov 2023 11:30:40 -0500
Subject: [PATCH 2/2] CI: Set kernel version to use in external intrepreter
 from requirements

---
 .github/scripts/install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh
index dd0dba9ad73..2277107c3d8 100755
--- a/.github/scripts/install.sh
+++ b/.github/scripts/install.sh
@@ -79,7 +79,8 @@ conda create -n jedi-test-env -q -y python=3.9 flask
 conda list -n jedi-test-env
 
 # Create environment to test conda env activation before launching a kernel
-conda create -n spytest-ž -q -y -c conda-forge python=3.9 spyder-kernels
+kernelVer="`cat requirements/main.yml | grep spyder-kernels | grep -o '[^>=]*$' | grep -o '^[^,<]*'`"
+conda create -n spytest-ž -q -y -c conda-forge python=3.9 spyder-kernels="${kernelVer}"
 conda list -n spytest-ž
 
 # Install pyenv on Linux systems