Merge from 5.x: PR #17578

Fixes #17563

MAINTENANCE.md

@@ -29,7 +29,7 @@ These are some instructions meant for maintainers of this repo.
 
 * If a PR in spyder-kernels solves an issue in Spyder but was not part of a PR that updated its subrepo, you need to open one that does precisely that, i.e. update its subrepo, in order to fix that issue.
 
-    The same goes for the python-lsp-server subrepo.
+    The same goes for the python-lsp-server and qtconsole subrepos.
 
 * There's a bot that constantly monitors all issues in order to close duplicates or already solved issues and inform users what they can do about them (basically wait to be fixed or update).
 

RELEASE.md

@@ -107,7 +107,7 @@ To release a new version of Spyder you need to follow these steps:
 
 * Update the version of any packages required before the release in the following files:
 
-  - `setup.py`
+  - `setup.py` (look up for the Windows installer patch too)
   - `spyder/dependencies.py`
   - `requirements/conda.txt`
   - `binder/environment.yml`

binder/environment.yml

@@ -29,19 +29,19 @@ dependencies:
 - pylint >=2.5.0
 - pyls-spyder >=0.4.0
 - pyqt <5.16
-- python-lsp-black >=1.0.0
-- python-lsp-server >=1.4.0,<1.5.0
+- python-lsp-black >=1.2.0
+- python-lsp-server >=1.4.1,<1.5.0
 - pyxdg >=0.26
 - pyzmq >=17
 - qdarkstyle >=3.0.2,<3.1.0
 - qstylizer >=0.1.10
 - qtawesome >=1.0.2
-- qtconsole >=5.2.1,<5.3.0
+- qtconsole >=5.3.0,<5.4.0
 - qtpy >=2.0.1
 - rtree >=0.9.7
 - setuptools >=49.6.0
 - sphinx >=0.6.6
-- spyder-kernels >=2.2.1,<2.3.0
+- spyder-kernels >=2.3.0,<2.4.0
 - textdistance >=4.2.0
 - three-merge >=0.1.1
 - watchdog >=0.10.3

installers/Windows/req-extras-pull-request.txt

@@ -18,7 +18,7 @@ cython
 sympy
 
 # Spyder external plugins
-spyder-terminal>=1.2.1
+spyder-terminal>=1.2.2
 
 # Spyder external dependencies (spyder-kernels and qdarkstyle)
 ./external-deps/spyder-kernels

installers/Windows/req-extras-release.txt

@@ -18,4 +18,4 @@ cython
 sympy
 
 # Spyder external plugins
-spyder-terminal>=1.2.1
+spyder-terminal>=1.2.2

installers/Windows/req-pull-request.txt

@@ -1,5 +1,5 @@
 # Spyder external plugins
-spyder-terminal>=1.2.1
+spyder-terminal>=1.2.2
 
 # Spyder external dependencies (spyder-kernels and qdarkstyle)
 ./external-deps/spyder-kernels

installers/Windows/req-release.txt

@@ -1,2 +1,2 @@
 # Spyder external plugins
-spyder-terminal>=1.2.1
+spyder-terminal>=1.2.2

installers/macOS/req-extras.txt

@@ -1,6 +1,5 @@
 # Spyder extra packages
 autopep8
-black==21.12b0  # App fails with version 22
 flake8
 Paramiko
 pycodestyle

requirements/conda.txt

@@ -25,19 +25,19 @@ pygments >=2.0
 pylint >=2.5.0
 pyls-spyder >=0.4.0
 pyqt <5.16
-python-lsp-black >=1.0.0
-python-lsp-server >=1.4.0,<1.5.0
+python-lsp-black >=1.2.0
+python-lsp-server >=1.4.1,<1.5.0
 pyxdg >=0.26
 pyzmq >=17
 qdarkstyle >=3.0.2,<3.1.0
 qstylizer >=0.1.10
 qtawesome >=1.0.2
-qtconsole >=5.2.1,<5.3.0
+qtconsole >=5.3.0,<5.4.0
 qtpy >=2.0.1
 rtree >=0.9.7
 setuptools >=49.6.0
 sphinx >=0.6.6
-spyder-kernels >=2.2.1,<2.3.0
+spyder-kernels >=2.3.0,<2.4.0
 textdistance >=4.2.0
 three-merge >=0.1.1
 watchdog >=0.10.3

setup.py

@@ -224,22 +224,22 @@ def run(self):
     'psutil>=5.3',
     'pygments>=2.0',
     'pylint>=2.5.0',
-    'python-lsp-black>=1.0.0',
+    'python-lsp-black>=1.2.0',
     'pyls-spyder>=0.4.0',
     'pyqt5<5.16',
     'pyqtwebengine<5.16',
-    'python-lsp-server[all]>=1.4.0,<1.5.0',
+    'python-lsp-server[all]>=1.4.1,<1.5.0',
     'pyxdg>=0.26;platform_system=="Linux"',
     'pyzmq>=17',
     'qdarkstyle>=3.0.2,<3.1.0',
     'qstylizer>=0.1.10',
     'qtawesome>=1.0.2',
-    'qtconsole>=5.2.1,<5.3.0',
+    'qtconsole>=5.3.0,<5.4.0',
     'qtpy>=2.0.1',
     'rtree>=0.9.7',
     'setuptools>=49.6.0',
     'sphinx>=0.6.6',
-    'spyder-kernels>=2.2.1,<2.3.0',
+    'spyder-kernels>=2.3.0,<2.4.0',
     'textdistance>=4.2.0',
     'three-merge>=0.1.1',
     'watchdog>=0.10.3'
@@ -248,8 +248,8 @@ def run(self):
 # Replace spyder-kernels constraint to enable
 # building Windows installers on PRs
 if 'dev' in __version__ and WINDOWS_INSTALLER_NAME:
-    install_requires.remove('spyder-kernels>=2.2.1,<2.3.0')
-    install_requires.append('spyder-kernels>=2.2.1,<=2.3.0.dev0')
+    install_requires.remove('spyder-kernels>=2.3.0,<2.4.0')
+    install_requires.append('spyder-kernels>=2.3.0,<=2.4.0.dev0')
 
 extras_require = {
     'test:platform_system == "Windows"': ['pywin32'],

spyder/dependencies.py

@@ -53,20 +53,20 @@
 PSUTIL_REQVER = '>=5.3'
 PYGMENTS_REQVER = '>=2.0'
 PYLINT_REQVER = '>=2.5.0'
-PYLSP_REQVER = '>=1.4.0;<1.5.0'
-PYLSP_BLACK_REQVER = '>=1.0.0'
+PYLSP_REQVER = '>=1.4.1;<1.5.0'
+PYLSP_BLACK_REQVER = '>=1.2.0'
 PYLS_SPYDER_REQVER = '>=0.4.0'
 PYXDG_REQVER = '>=0.26'
 PYZMQ_REQVER = '>=17'
 QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0'
 QSTYLIZER_REQVER = '>=0.1.10'
 QTAWESOME_REQVER = '>=1.0.2'
-QTCONSOLE_REQVER = '>=5.2.1;<5.3.0'
+QTCONSOLE_REQVER = '>=5.3.0;<5.4.0'
 QTPY_REQVER = '>=2.0.1'
 RTREE_REQVER = '>=0.9.7'
 SETUPTOOLS_REQVER = '>=49.6.0'
 SPHINX_REQVER = '>=0.6.6'
-SPYDER_KERNELS_REQVER = '>=2.2.1;<2.3.0'
+SPYDER_KERNELS_REQVER = '>=2.3.0;<2.4.0'
 TEXTDISTANCE_REQVER = '>=4.2.0'
 THREE_MERGE_REQVER = '>=0.1.1'
 # None for pynsist install for now

spyder/plugins/ipythonconsole/widgets/main_widget.py

@@ -58,8 +58,8 @@
 # ---- Constants
 # =============================================================================
 MAIN_BG_COLOR = QStylePalette.COLOR_BACKGROUND_1
-SPYDER_KERNELS_MIN_VERSION = '2.2.1'
-SPYDER_KERNELS_MAX_VERSION = '2.3.0'
+SPYDER_KERNELS_MIN_VERSION = '2.3.0'
+SPYDER_KERNELS_MAX_VERSION = '2.4.0'
 SPYDER_KERNELS_VERSION = (
     f'>={SPYDER_KERNELS_MIN_VERSION};<{SPYDER_KERNELS_MAX_VERSION}')
 SPYDER_KERNELS_VERSION_MSG = _(