Merge from 5.x: PR #21155

Fixes #21063
spyder-ide · Jul 17, 2023 · 5ed9986 · 5ed9986
2 parents b570042 + 10705da
commit 5ed9986
Show file tree

Hide file tree

Showing 12 changed files with 112 additions and 40 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -32,7 +32,7 @@ dependencies:
 - pyqt <5.16
 - pyqtwebengine <5.16
 - python-lsp-black >=1.2.0,<3.0.0
-- python-lsp-server >=1.7.2,<1.8.0
+- python-lsp-server >=1.7.4,<1.8.0
 - pyxdg >=0.26
 - pyzmq >=22.1.0
 - qdarkstyle >=3.0.2,<3.2.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/README.md b/external-deps/python-lsp-server/README.md
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/pylint_lint.py b/external-deps/python-lsp-server/pylsp/plugins/pylint_lint.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
diff --git a/external-deps/python-lsp-server/test/test_workspace.py b/external-deps/python-lsp-server/test/test_workspace.py
diff --git a/requirements/main.yml b/requirements/main.yml
@@ -30,7 +30,7 @@ dependencies:
   - pyqt <5.16
   - pyqtwebengine <5.16
   - python-lsp-black >=1.2.0,<3.0.0
-  - python-lsp-server >=1.7.2,<1.8.0
+  - python-lsp-server >=1.7.4,<1.8.0
   - pyzmq >=22.1.0
   - qdarkstyle >=3.0.2,<3.2.0
   - qstylizer >=0.2.2

diff --git a/setup.py b/setup.py
@@ -228,7 +228,7 @@ def run(self):
     'pyls-spyder>=0.4.0',
     'pyqt5<5.16',
     'pyqtwebengine<5.16',
-    'python-lsp-server[all]>=1.7.2,<1.8.0',
+    'python-lsp-server[all]>=1.7.4,<1.8.0',
     'pyxdg>=0.26;platform_system=="Linux"',
     'pyzmq>=22.1.0',
     'qdarkstyle>=3.0.2,<3.2.0',
@@ -250,7 +250,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.7.2,<1.9.0')
+    install_requires.append('python-lsp-server[all]>=1.7.4,<1.9.0')
     install_requires.append('qtconsole>=5.4.2,<5.6.0')
     install_requires.append('spyder-kernels>=3.0.0b1,<3.1.0')
 

diff --git a/spyder/dependencies.py b/spyder/dependencies.py
@@ -52,7 +52,7 @@
 PYGMENTS_REQVER = '>=2.0'
 PYLINT_REQVER = '>=2.5.0,<3.0'
 PYLINT_VENV_REQVER = '>=3.0.2'
-PYLSP_REQVER = '>=1.7.2,<1.8.0'
+PYLSP_REQVER = '>=1.7.4,<1.8.0'
 PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0'
 PYLS_SPYDER_REQVER = '>=0.4.0'
 PYXDG_REQVER = '>=0.26'