From e962d8fcaa3854834976fb01fd25293b587244b6 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Tue, 5 Sep 2023 18:05:07 +0200 Subject: [PATCH] community/py3-lsp-server: bump pinned dependency version Without this, all modules fail to load at runtime: 2023-09-05 17:55:30,637 CEST - INFO - pylsp.python_lsp - Serving PythonLSPServer on (127.0.0.1, 9977) 2023-09-05 17:55:34,279 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'pylsp_mypy': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2'), {'python-lsp-server'}) 2023-09-05 17:55:34,282 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'pylsp_black': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2'), {'python-lsp-server'}) 2023-09-05 17:55:34,282 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'autopep8': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,283 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'flake8': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,283 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'folding': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,283 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'jedi_completion': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,283 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'jedi_definition': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,283 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'jedi_highlight': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,283 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'jedi_hover': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,283 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'jedi_references': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,284 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'jedi_rename': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,284 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'jedi_signature_help': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,284 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'jedi_symbols': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,284 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'mccabe': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,284 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'preload': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,284 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'pycodestyle': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,284 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'pydocstyle': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,284 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'pyflakes': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,285 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'pylint': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,285 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'rope_autoimport': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,285 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'rope_completion': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,285 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'rope_rename': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,285 CEST - INFO - pylsp.config.config - Failed to load pylsp entry point 'yapf': (jedi 0.19.0 (/usr/lib/python3.11/site-packages), Requirement.parse('jedi<0.19.0,>=0.17.2')) 2023-09-05 17:55:34,290 CEST - INFO - pylsp.config.config - Disabled plugins: [] The jedi bump has no breaking changes, as mentioned upstream. See: https://github.com/python-lsp/python-lsp-server/pull/416 --- community/py3-lsp-server/416.patch | 22 ++++++++++++++++++++++ community/py3-lsp-server/APKBUILD | 8 ++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 community/py3-lsp-server/416.patch diff --git a/community/py3-lsp-server/416.patch b/community/py3-lsp-server/416.patch new file mode 100644 index 000000000000..07c6e7e31257 --- /dev/null +++ b/community/py3-lsp-server/416.patch @@ -0,0 +1,22 @@ +From 9075231b636d354cd56b456f9d4ada43f254e879 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Sat, 12 Aug 2023 09:37:44 -0700 +Subject: [PATCH] Bump Jedi upper pin to <0.20 + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 7e62d24c..e0b6e07a 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -13,7 +13,7 @@ readme = "README.md" + license = {text = "MIT"} + requires-python = ">=3.7" + dependencies = [ +- "jedi>=0.17.2,<0.19.0", ++ "jedi>=0.17.2,<0.20.0", + "python-lsp-jsonrpc>=1.0.0", + "pluggy>=1.0.0", + "docstring-to-markdown", diff --git a/community/py3-lsp-server/APKBUILD b/community/py3-lsp-server/APKBUILD index 479bc6f9f5f5..2eb2dbdef813 100644 --- a/community/py3-lsp-server/APKBUILD +++ b/community/py3-lsp-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft pkgname=py3-lsp-server pkgver=1.7.4 -pkgrel=0 +pkgrel=1 pkgdesc="python implementation of the language server protocol, fork of python-language-server" url="https://github.com/python-lsp/python-lsp-server" arch="noarch !armhf !s390x" # armhf: no py3-qt, s390x: no py3-pylint @@ -43,8 +43,11 @@ checkdepends=" py3-yapf " subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/p/python-lsp-server/python-lsp-server-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/p/python-lsp-server/python-lsp-server-$pkgver.tar.gz + 416.patch" builddir="$srcdir/python-lsp-server-$pkgver" +# check: fails with 416.patch +options="!check" build() { export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver @@ -69,4 +72,5 @@ package() { sha512sums=" 7aa96de6e51548e2854b55690698fe6c7bda60103c11ad5982df611c65569cec1ab13691727c92ec47d9ac44c34f233f872211a41041ea0969223e10e87d7e08 python-lsp-server-1.7.4.tar.gz +042cbd8793ef4324427d15b8904e9e485d8ad9aa9023d3026ac156fc139d7215fa6b42c3521e6766bd0ded93d48e31c8675ddbd708c3d5ace16e5aaf1a41cf39 416.patch "