Merge from 5.x: PR #21629

Fixes #21460
spyder-ide · Dec 20, 2023 · a71a7e0 · a71a7e0
2 parents da35601 + 4d1c87c
commit a71a7e0
Show file tree

Hide file tree

Showing 18 changed files with 232 additions and 131 deletions.
diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh
@@ -26,9 +26,6 @@ if [ "$USE_CONDA" = "true" ]; then
     # Remove pylsp before installing its subrepo below
     micromamba remove --force python-lsp-server python-lsp-server-base -y
 
-    # Prevent error in a test for the %edit magic
-    micromamba install ipykernel=6.26.0 -q -y
-
 else
     # Update pip and setuptools
     python -m pip install -U pip setuptools wheel build
@@ -45,8 +42,6 @@ else
     # To check our manifest
     pip install -q check-manifest
 
-    # Prevent error in a test for the %edit magic
-    pip install ipykernel==6.26.0
 
 fi
 

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -33,7 +33,7 @@ dependencies:
 - pyls-spyder >=0.4.0
 - pyqt >=5.15,<5.16
 - pyqtwebengine >=5.15,<5.16
-- python-lsp-black >=1.2.0,<3.0.0
+- python-lsp-black >=2.0.0,<3.0.0
 - python-lsp-server >=1.9.0,<1.10.0
 - pyuca >=1.2
 - pyxdg >=0.26

diff --git a/external-deps/python-lsp-server/.gitrepo b/external-deps/python-lsp-server/.gitrepo
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/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_completion.py b/external-deps/python-lsp-server/pylsp/plugins/jedi_completion.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/python_lsp.py b/external-deps/python-lsp-server/pylsp/python_lsp.py
diff --git a/external-deps/python-lsp-server/pylsp/workspace.py b/external-deps/python-lsp-server/pylsp/workspace.py
diff --git a/external-deps/python-lsp-server/pyproject.toml b/external-deps/python-lsp-server/pyproject.toml