Merge from 5.x: PR #21764

Fixes #21630
spyder-ide · Feb 6, 2024 · 95a4b3b · 95a4b3b
2 parents 13d4eb4 + ced0965
commit 95a4b3b
Show file tree

Hide file tree

Showing 80 changed files with 432 additions and 266 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -34,14 +34,14 @@ dependencies:
 - pyqt >=5.15,<5.16
 - pyqtwebengine >=5.15,<5.16
 - python-lsp-black >=2.0.0,<3.0.0
-- python-lsp-server >=1.9.0,<1.10.0
+- python-lsp-server >=1.10.0,<1.11.0
 - pyuca >=1.2
 - pyxdg >=0.26
 - pyzmq >=22.1.0
 - qdarkstyle >=3.2.0,<3.3.0
 - qstylizer >=0.2.2
 - qtawesome >=1.3.0
-- qtconsole >=5.5.0,<5.6.0
+- qtconsole >=5.5.1,<5.6.0
 - qtpy >=2.4.0
 - rtree >=0.9.7
 - setuptools >=49.6.0

diff --git a/external-deps/python-lsp-server/.git-blame-ignore-revs b/external-deps/python-lsp-server/.git-blame-ignore-revs
diff --git a/external-deps/python-lsp-server/.github/workflows/static.yml b/external-deps/python-lsp-server/.github/workflows/static.yml
diff --git a/external-deps/python-lsp-server/.gitrepo b/external-deps/python-lsp-server/.gitrepo
diff --git a/external-deps/python-lsp-server/.pylintrc b/external-deps/python-lsp-server/.pylintrc
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/MANIFEST.in b/external-deps/python-lsp-server/MANIFEST.in
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/__init__.py b/external-deps/python-lsp-server/pylsp/__init__.py
diff --git a/external-deps/python-lsp-server/pylsp/__main__.py b/external-deps/python-lsp-server/pylsp/__main__.py
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/config/config.py b/external-deps/python-lsp-server/pylsp/config/config.py
diff --git a/external-deps/python-lsp-server/pylsp/config/flake8_conf.py b/external-deps/python-lsp-server/pylsp/config/flake8_conf.py
diff --git a/external-deps/python-lsp-server/pylsp/config/pycodestyle_conf.py b/external-deps/python-lsp-server/pylsp/config/pycodestyle_conf.py
diff --git a/external-deps/python-lsp-server/pylsp/hookspecs.py b/external-deps/python-lsp-server/pylsp/hookspecs.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/_resolvers.py b/external-deps/python-lsp-server/pylsp/plugins/_resolvers.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/_rope_task_handle.py b/external-deps/python-lsp-server/pylsp/plugins/_rope_task_handle.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/autopep8_format.py b/external-deps/python-lsp-server/pylsp/plugins/autopep8_format.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/definition.py b/external-deps/python-lsp-server/pylsp/plugins/definition.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/highlight.py b/external-deps/python-lsp-server/pylsp/plugins/highlight.py
diff --git a/external-deps/python-lsp-server/pylsp/plugins/hover.py b/external-deps/python-lsp-server/pylsp/plugins/hover.py