Merge from 5.x: PR #21942

Fixes #21936
spyder-ide · Mar 30, 2024 · 48ae9dc · 48ae9dc
2 parents 4b34f79 + 26244db
commit 48ae9dc
Show file tree

Hide file tree

Showing 20 changed files with 117 additions and 165 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -28,13 +28,13 @@ dependencies:
 - pickleshare >=0.4
 - psutil >=5.3
 - pygments >=2.0
-- pylint >=2.5.0,<3.1
+- pylint >=3.1,<4
 - pylint-venv >=3.0.2
 - pyls-spyder >=0.4.0
 - pyqt >=5.15,<5.16
 - pyqtwebengine >=5.15,<5.16
 - python-lsp-black >=2.0.0,<3.0.0
-- python-lsp-server >=1.10.0,<1.11.0
+- python-lsp-server >=1.11.0,<1.12.0
 - pyuca >=1.2
 - pyxdg >=0.26
 - pyzmq >=24.0.0

diff --git a/external-deps/python-lsp-server/.gitrepo b/external-deps/python-lsp-server/.gitrepo
diff --git a/external-deps/python-lsp-server/CHANGELOG.md b/external-deps/python-lsp-server/CHANGELOG.md
diff --git a/external-deps/python-lsp-server/CONTRIBUTING.md b/external-deps/python-lsp-server/CONTRIBUTING.md
diff --git a/external-deps/python-lsp-server/README.md b/external-deps/python-lsp-server/README.md
diff --git a/external-deps/python-lsp-server/pylsp/_utils.py b/external-deps/python-lsp-server/pylsp/_utils.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/flake8_lint.py b/external-deps/python-lsp-server/pylsp/plugins/flake8_lint.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/jedi_rename.py b/external-deps/python-lsp-server/pylsp/plugins/jedi_rename.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/pylint_lint.py b/external-deps/python-lsp-server/pylsp/plugins/pylint_lint.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/rope_autoimport.py b/external-deps/python-lsp-server/pylsp/plugins/rope_autoimport.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/rope_rename.py b/external-deps/python-lsp-server/pylsp/plugins/rope_rename.py
diff --git a/external-deps/python-lsp-server/pylsp/python_lsp.py b/external-deps/python-lsp-server/pylsp/python_lsp.py
diff --git a/external-deps/python-lsp-server/pylsp/uris.py b/external-deps/python-lsp-server/pylsp/uris.py
diff --git a/external-deps/python-lsp-server/pyproject.toml b/external-deps/python-lsp-server/pyproject.toml
diff --git a/external-deps/python-lsp-server/test/conftest.py b/external-deps/python-lsp-server/test/conftest.py
diff --git a/external-deps/python-lsp-server/test/plugins/test_autoimport.py b/external-deps/python-lsp-server/test/plugins/test_autoimport.py