Merge from 5.x: PR #21470

.github/scripts/install.sh

@@ -30,6 +30,9 @@ 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
@@ -46,6 +49,9 @@ 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

@@ -28,7 +28,7 @@ dependencies:
 - pickleshare >=0.4
 - psutil >=5.3
 - pygments >=2.0
-- pylint >=2.5.0,<3.0
+- pylint >=2.5.0,<3.1
 - pylint-venv >=3.0.2
 - pyls-spyder >=0.4.0
 - pyqt <5.16