Merge from 5.x: PR #22385

Fixes #22376

binder/environment.yml

@@ -38,7 +38,7 @@ dependencies:
 - pyqt >=5.15,<5.16
 - pyqtwebengine >=5.15,<5.16
 - python-lsp-black >=2.0.0,<3.0.0
-- python-lsp-server >=1.11.0,<1.12.0
+- python-lsp-server >=1.12.0,<1.13.0
 - pyuca >=1.2
 - pyxdg >=0.26
 - pyzmq >=24.0.0

requirements/main.yml

@@ -36,7 +36,7 @@ dependencies:
   - pyqt >=5.15,<5.16
   - pyqtwebengine >=5.15,<5.16
   - python-lsp-black >=2.0.0,<3.0.0
-  - python-lsp-server >=1.11.0,<1.12.0
+  - python-lsp-server >=1.12.0,<1.13.0
   - pyuca >=1.2
   - pyzmq >=24.0.0
   - qdarkstyle >=3.2.0,<3.3.0

setup.py

@@ -235,7 +235,7 @@ def run(self):
     'pyqt5>=5.15,<5.16',
     'pyqtwebengine>=5.15,<5.16',
     'python-lsp-black>=2.0.0,<3.0.0',
-    'python-lsp-server[all]>=1.11.0,<1.12.0',
+    'python-lsp-server[all]>=1.12.0,<1.13.0',
     'pyuca>=1.2',
     'pyxdg>=0.26;platform_system=="Linux"',
     'pyzmq>=24.0.0',
@@ -260,7 +260,7 @@ def run(self):
     reqs_to_loosen = {'python-lsp-server[all]', 'qtconsole', 'spyder-kernels'}
     install_requires = [req for req in install_requires
                         if req.split(">")[0] not in reqs_to_loosen]
-    install_requires.append('python-lsp-server[all]>=1.11.0,<1.13.0')
+    install_requires.append('python-lsp-server[all]>=1.12.0,<1.14.0')
     install_requires.append('qtconsole>=5.5.1,<5.7.0')
     install_requires.append('spyder-kernels>=3.0.0b9,<3.1.0')
 

spyder/dependencies.py

@@ -59,7 +59,7 @@
 PYGMENTS_REQVER = '>=2.0'
 PYLINT_REQVER = '>=3.1,<4'
 PYLINT_VENV_REQVER = '>=3.0.2'
-PYLSP_REQVER = '>=1.11.0,<1.12.0'
+PYLSP_REQVER = '>=1.12.0,<1.13.0'
 PYLSP_BLACK_REQVER = '>=2.0.0,<3.0.0'
 PYLS_SPYDER_REQVER = '>=0.4.0'
 PYUCA_REQVER = '>=1.2'