Merge from 5.x: PR #21502

Fixes #21440

.github/scripts/install.sh

@@ -30,9 +30,6 @@ if [ "$USE_CONDA" = "true" ]; then
     # So, pinning it to 8.14 for now.
     micromamba install ipython=8.14
 
-    # Install Pylint 3 to run our tests with it
-    micromamba install pylint=3 -q -y
-
 else
     # Update pip and setuptools
     python -m pip install -U pip setuptools wheel build
@@ -49,9 +46,6 @@ else
     # To check our manifest
     pip install -q check-manifest
 
-    # Install Pylint 3 to run our tests with it
-    pip install -U pylint
-
     # This allows the test suite to run more reliably on Linux
     if [ "$OS" = "linux" ]; then
         pip uninstall pyqt5 pyqt5-qt5 pyqt5-sip pyqtwebengine pyqtwebengine-qt5 -q -y

binder/environment.yml

@@ -34,7 +34,7 @@ dependencies:
 - 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
+- python-lsp-server >=1.9.0,<1.10.0
 - pyuca >=1.2
 - pyxdg >=0.26
 - pyzmq >=22.1.0

requirements/main.yml

@@ -31,7 +31,7 @@ dependencies:
   - 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
+  - python-lsp-server >=1.9.0,<1.10.0
   - pyuca >=1.2
   - pyzmq >=22.1.0
   - qdarkstyle >=3.2.0,<3.3.0

setup.py

@@ -231,7 +231,7 @@ def run(self):
     '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',
+    'python-lsp-server[all]>=1.9.0,<1.10.0',
     'pyuca>=1.2',
     'pyxdg>=0.26;platform_system=="Linux"',
     'pyzmq>=22.1.0',
@@ -255,7 +255,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.8.0,<1.10.0')
+    install_requires.append('python-lsp-server[all]>=1.9.0,<1.11.0')
     install_requires.append('qtconsole>=5.5.0,<5.7.0')
     install_requires.append('spyder-kernels>=3.0.0b2,<3.1.0')
 

spyder/dependencies.py

@@ -56,7 +56,7 @@
 PYGMENTS_REQVER = '>=2.0'
 PYLINT_REQVER = '>=2.5.0,<3.1'
 PYLINT_VENV_REQVER = '>=3.0.2'
-PYLSP_REQVER = '>=1.8.0,<1.9.0'
+PYLSP_REQVER = '>=1.9.0,<1.10.0'
 PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0'
 PYLS_SPYDER_REQVER = '>=0.4.0'
 PYUCA_REQVER = '>=1.2'