From 72e992386c3617ecfb957a51e6b910890e931358 Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:53:20 -0500 Subject: [PATCH 1/2] Update core dependencies --- binder/environment.yml | 2 +- requirements/main.yml | 2 +- setup.py | 4 ++-- spyder/dependencies.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/binder/environment.yml b/binder/environment.yml index f3773d90ec9..7ed317b8082 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -32,7 +32,7 @@ dependencies: - pyqt >=5.10,<5.16 - pyqtwebengine >=5.10,<5.16 - python-lsp-black >=2.0.0,<3.0.0 -- python-lsp-server >=1.11.0,<1.12.0 +- python-lsp-server >=1.12.0,<1.13.0 - pyxdg >=0.26 - pyzmq >=24.0.0 - qdarkstyle >=3.2.0,<3.3.0 diff --git a/requirements/main.yml b/requirements/main.yml index 48156fd5cdc..e2a3012d5db 100644 --- a/requirements/main.yml +++ b/requirements/main.yml @@ -31,7 +31,7 @@ dependencies: - pyqt >=5.10,<5.16 - pyqtwebengine >=5.10,<5.16 - python-lsp-black >=2.0.0,<3.0.0 - - python-lsp-server >=1.11.0,<1.12.0 + - python-lsp-server >=1.12.0,<1.13.0 - pyzmq >=24.0.0 - qdarkstyle >=3.2.0,<3.3.0 - qstylizer >=0.2.2 diff --git a/setup.py b/setup.py index 48c45f69de8..e3d729188fa 100644 --- a/setup.py +++ b/setup.py @@ -235,7 +235,7 @@ def run(self): 'pyls-spyder>=0.4.0', 'pyqt5>=5.10,<5.16', 'pyqtwebengine>=5.10,<5.16', - 'python-lsp-server[all]>=1.11.0,<1.12.0', + 'python-lsp-server[all]>=1.12.0,<1.13.0', 'pyxdg>=0.26;platform_system=="Linux"', 'pyzmq>=24.0.0', 'qdarkstyle>=3.2.0,<3.3.0', @@ -257,7 +257,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.11.0,<1.13.0') + install_requires.append('python-lsp-server[all]>=1.12.0,<1.14.0') install_requires.append('qtconsole>=5.5.1,<5.7.0') install_requires.append('spyder-kernels>=2.5.2,<2.7.0') diff --git a/spyder/dependencies.py b/spyder/dependencies.py index 563dd79534a..0d29db34e87 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -59,7 +59,7 @@ PYGMENTS_REQVER = '>=2.0' PYLINT_REQVER = '>=3.1,<4' PYLINT_VENV_REQVER = '>=3.0.2' -PYLSP_REQVER = '>=1.11.0,<1.12.0' +PYLSP_REQVER = '>=1.12.0,<1.13.0' PYLSP_BLACK_REQVER = '>=2.0.0,<3.0.0' PYLS_SPYDER_REQVER = '>=0.4.0' PYXDG_REQVER = '>=0.26' From ed7df823a1206113da417616f48c1c423fe11499 Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:54:49 -0500 Subject: [PATCH 2/2] git subrepo pull external-deps/python-lsp-server subrepo: subdir: "external-deps/python-lsp-server" merged: "eb61ccd97" upstream: origin: "https://github.com/python-lsp/python-lsp-server.git" branch: "develop" commit: "eb61ccd97" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" --- external-deps/python-lsp-server/.gitrepo | 4 +-- external-deps/python-lsp-server/CHANGELOG.md | 29 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/external-deps/python-lsp-server/.gitrepo b/external-deps/python-lsp-server/.gitrepo index aced76c80cd..62b1d87c209 100644 --- a/external-deps/python-lsp-server/.gitrepo +++ b/external-deps/python-lsp-server/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/python-lsp/python-lsp-server.git branch = develop - commit = 3215ea6492cedb34cdf37f4c5f6c4ed6c1550fdf - parent = b40f1922be38356103dd3e233a978e60cc898403 + commit = eb61ccd97bbe9c58fbde6496a78015ee3c129146 + parent = 72e992386c3617ecfb957a51e6b910890e931358 method = merge cmdver = 0.4.3 diff --git a/external-deps/python-lsp-server/CHANGELOG.md b/external-deps/python-lsp-server/CHANGELOG.md index dcc85065903..e4922ced932 100644 --- a/external-deps/python-lsp-server/CHANGELOG.md +++ b/external-deps/python-lsp-server/CHANGELOG.md @@ -1,5 +1,34 @@ # History of changes +## Version 1.12.0 (2024/08/25) + +### New features + +* Add support for `window/logMessage`. +* Add version support to `workspace/publishDiagnostics`. +* Add `extendSelect` option to flake8 plugin. +* Allow Jedi's `extra_paths` to be placed in front of `sys.path`. +* Bump flake8 to 7.1 + +### Pull Requests Merged + +* [PR 586](https://github.com/python-lsp/python-lsp-server/pull/586) - Update versions of Github actions used on CI, by [@ccordoba12](https://github.com/ccordoba12) +* [PR 585](https://github.com/python-lsp/python-lsp-server/pull/585) - Fix linting issues reported by the latest version of Ruff, by [@ccordoba12](https://github.com/ccordoba12) +* [PR 584](https://github.com/python-lsp/python-lsp-server/pull/584) - Use `%r` to have a better log, by [@tebeka](https://github.com/tebeka) +* [PR 581](https://github.com/python-lsp/python-lsp-server/pull/581) - Set return type to `None` for functions without returns, by [@agserrano3](https://github.com/agserrano3) +* [PR 576](https://github.com/python-lsp/python-lsp-server/pull/576) - Bump flake8 to 7.1, by [@bnavigator](https://github.com/bnavigator) +* [PR 573](https://github.com/python-lsp/python-lsp-server/pull/573) - Add `window/logMessage` support, by [@Dylmay](https://github.com/Dylmay) +* [PR 570](https://github.com/python-lsp/python-lsp-server/pull/570) - Fix Fedora instructions, by [@penguinpee](https://github.com/penguinpee) +* [PR 565](https://github.com/python-lsp/python-lsp-server/pull/565) - Add version support to `workspace/publishDiagnostics`, by [@Dylmay](https://github.com/Dylmay) +* [PR 560](https://github.com/python-lsp/python-lsp-server/pull/560) - Use macOS 13 to run our tests on CI, by [@ccordoba12](https://github.com/ccordoba12) +* [PR 559](https://github.com/python-lsp/python-lsp-server/pull/559) - Add `extendSelect` option to flake8 plugin, by [@Susensio](https://github.com/Susensio) +* [PR 547](https://github.com/python-lsp/python-lsp-server/pull/547) - Infer end position for Pylint diagnostics, by [@Wuestengecko](https://github.com/Wuestengecko) +* [PR 527](https://github.com/python-lsp/python-lsp-server/pull/527) - Allow `extra_paths` to be placed in front of `sys.path`, by [@mrclary](https://github.com/mrclary) + +In this release 12 pull requests were closed. + +---- + ## Version 1.11.0 (2024/03/29) ### New features