Skip to content

Commit

Permalink
Merge pull request #21500 from ccordoba12/increase-pyqt-req
Browse files Browse the repository at this point in the history
PR: Increase minimal supported PyQt version to 5.10
  • Loading branch information
ccordoba12 authored Nov 7, 2023
2 parents e8e8d03 + c3d322b commit f60290a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
4 changes: 2 additions & 2 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion spyder/requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit f60290a

Please sign in to comment.