Skip to content

Commit

Permalink
Merge from 5.x: PR spyder-ide#21500
Browse files Browse the repository at this point in the history
  • Loading branch information
ccordoba12 committed Nov 7, 2023
2 parents 2429caa + f60290a commit 6344c73
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,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 @@ -31,8 +31,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
- pyuca >=1.2
Expand Down
4 changes: 2 additions & 2 deletions requirements/main.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
- pyuca >=1.2
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ def run(self):
'pylint>=2.5.0,<3.1',
'pylint-venv>=3.0.2',
'pyls-spyder>=0.4.0',
'pyqt5<5.16',
'pyqtwebengine<5.16',
'pyqt5>=5.10,<5.16',
'pyqtwebengine>=5.10,<5.16',
'python-lsp-black>=1.2.0,<3.0.0',
'python-lsp-server[all]>=1.8.0,<1.9.0',
'pyuca>=1.2',
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 6344c73

Please sign in to comment.