From 25048e8fb6d4e767489dce7a6f1b0f58b42b0a4b Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 2 Apr 2022 14:40:04 -0700 Subject: [PATCH 1/4] python3-pluggy: update to 1.0.0 --- srcpkgs/python3-pluggy/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template index efaa7e25d2a731..fa49c9826db0ec 100644 --- a/srcpkgs/python3-pluggy/template +++ b/srcpkgs/python3-pluggy/template @@ -1,7 +1,7 @@ # Template file for 'python3-pluggy' pkgname=python3-pluggy -version=0.13.1 -revision=7 +version=1.0.0 +revision=1 wrksrc="pluggy-${version}" build_style=python3-module hostmakedepends="python3-setuptools_scm" @@ -12,9 +12,12 @@ maintainer="Piotr Wójcik " license="MIT" homepage="https://github.com/pytest-dev/pluggy" distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz" -checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0 +checksum=4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 do_check() { + # Must export PYTHONPATH so subprocesses see the variable + local _pypath="${PYTHONPATH}" + export PYTHONPATH="${PWD}/src:${PYTHONPATH}" python3 -m pytest } From 45de7a497e1deee155dbdc844383c48d542801b8 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 2 Apr 2022 11:54:44 -0700 Subject: [PATCH 2/4] New package: python3-lsp-jsonrpc-1.0.0 --- srcpkgs/python3-lsp-jsonrpc/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/python3-lsp-jsonrpc/template diff --git a/srcpkgs/python3-lsp-jsonrpc/template b/srcpkgs/python3-lsp-jsonrpc/template new file mode 100644 index 00000000000000..1455aa108797bc --- /dev/null +++ b/srcpkgs/python3-lsp-jsonrpc/template @@ -0,0 +1,23 @@ +# Template file for 'python3-lsp-jsonrpc' +pkgname=python3-lsp-jsonrpc +version=1.0.0 +revision=1 +wrksrc="${pkgname/3}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-ultrajson" +checkdepends="python3-pytest python3-pytest-cov" +short_desc="Python server implementation of the JSON RPC 2.0 protocol" +maintainer="Cameron Nemo " +license="MIT" +homepage="https://github.com/python-lsp/python-lsp-jsonrpc" +distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" +checksum=7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd + +post_install() { + vlicense LICENSE +} + +do_check() { + python3 -m pytest --ignore=test/test_streams.py +} From b5f037da48745ae5028c349a97dd5e6d9a41ba1d Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 2 Apr 2022 11:53:38 -0700 Subject: [PATCH 3/4] New package: python3-lsp-server-1.4.1 Substitute for python3-language-server Fixes #34192 --- srcpkgs/python3-language-server | 1 + .../patches/jedi_compat.patch | 37 ----------------- srcpkgs/python3-language-server/template | 30 -------------- srcpkgs/python3-lsp-server/template | 40 +++++++++++++++++++ 4 files changed, 41 insertions(+), 67 deletions(-) create mode 120000 srcpkgs/python3-language-server delete mode 100644 srcpkgs/python3-language-server/patches/jedi_compat.patch delete mode 100644 srcpkgs/python3-language-server/template create mode 100644 srcpkgs/python3-lsp-server/template diff --git a/srcpkgs/python3-language-server b/srcpkgs/python3-language-server new file mode 120000 index 00000000000000..9054a5e99f7e69 --- /dev/null +++ b/srcpkgs/python3-language-server @@ -0,0 +1 @@ +python3-lsp-server \ No newline at end of file diff --git a/srcpkgs/python3-language-server/patches/jedi_compat.patch b/srcpkgs/python3-language-server/patches/jedi_compat.patch deleted file mode 100644 index 52e7e3c59abe03..00000000000000 --- a/srcpkgs/python3-language-server/patches/jedi_compat.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/palantir/python-language-server/pull/901 - -From: bnavigator -Date: Tue, 5 Jan 2021 01:17:33 +0100 -Subject: [PATCH] bump jedi compatibility: compare to Path-like object - ---- - pyls/plugins/symbols.py | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py -index 6468dd83..69a09fe9 100644 ---- a/pyls/plugins/symbols.py -+++ b/pyls/plugins/symbols.py -@@ -37,7 +37,7 @@ def pyls_document_symbols(config, document): - not sym_full_name.startswith('__main__')): - continue - -- if _include_def(d) and document.path == d.module_path: -+ if _include_def(d) and os.path.samefile(document.path, d.module_path): - tuple_range = _tuple_range(d) - if tuple_range in exclude: - continue -diff --git a/setup.py b/setup.py -index 12782990..99d2b312 100755 ---- a/setup.py -+++ b/setup.py -@@ -10,7 +10,7 @@ - 'configparser; python_version<"3.0"', - 'future>=0.14.0; python_version<"3"', - 'backports.functools_lru_cache; python_version<"3.2"', -- 'jedi>=0.17.2,<0.18.0', -+ 'jedi>=0.17.2,<0.19.0', - 'python-jsonrpc-server>=0.4.0', - 'pluggy', - 'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"', diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template deleted file mode 100644 index a443ec3fb514a6..00000000000000 --- a/srcpkgs/python3-language-server/template +++ /dev/null @@ -1,30 +0,0 @@ -# Template file for 'python3-language-server' -pkgname=python3-language-server -version=0.36.2 -revision=1 -wrksrc="${pkgname/3}-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson - python3-setuptools" -checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib - python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle - python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov - python3-yapf" -short_desc="Python implementation of the Language Server Protocol" -maintainer="k4leg " -license="MIT" -homepage="https://github.com/palantir/python-language-server" -distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" -checksum=9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0 -# Needs unpackaged rope and versioneer -# https://github.com/palantir/python-language-server/blob/develop/setup.py#L51 -make_check=no - -post_patch() { - vsed -i setup.py -e 's/\bujson<=1.35\b/ujson/' -} - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template new file mode 100644 index 00000000000000..cda7c928052a77 --- /dev/null +++ b/srcpkgs/python3-lsp-server/template @@ -0,0 +1,40 @@ +# Template file for 'python3-lsp-server' +pkgname=python3-lsp-server +version=1.4.1 +revision=1 +wrksrc="${pkgname/3}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel" +depends="python3-jedi python3-pluggy python3-lsp-jsonrpc python3-ultrajson + python3-setuptools" +checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib + python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle + python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov + python3-yapf flake8" +short_desc="Python implementation of the Language Server Protocol" +maintainer="Cameron Nemo " +license="MIT" +homepage="https://github.com/python-lsp/python-lsp-server" +distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" +checksum=be7f83298af9f0951a93972cafc9db04fd7cf5c05f20812515275f0ba70e342f + +do_check() { + python3 -m pytest \ + --ignore=test/plugins/test_completion.py \ + --ignore=test/plugins/test_pydocstyle_lint.py \ + --ignore=test/plugins/test_rope_rename.py +} + +post_install() { + vlicense LICENSE + ln -s pylsp "${DESTDIR}/usr/bin/pyls" +} + +python3-language-server_package() { + build_style=meta + depends="python3-lsp-server>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + pkg_install() { + vmove usr/bin/pyls + } +} From 03b5cd04e63ca70374cd7197345614d276214e18 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 2 Apr 2022 11:52:16 -0700 Subject: [PATCH 4/4] python3-jsonrpc-server: remove package --- srcpkgs/python3-jsonrpc-server/template | 22 ---------------------- srcpkgs/removed-packages/template | 3 ++- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/python3-jsonrpc-server/template diff --git a/srcpkgs/python3-jsonrpc-server/template b/srcpkgs/python3-jsonrpc-server/template deleted file mode 100644 index de96976ad0a238..00000000000000 --- a/srcpkgs/python3-jsonrpc-server/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'python3-jsonrpc-server' -pkgname=python3-jsonrpc-server -version=0.4.0 -revision=2 -wrksrc="${pkgname/3}-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-ultrajson" -short_desc="Python library implementing asynchronous JSON RPC server" -maintainer="k4leg " -license="MIT" -homepage="https://github.com/palantir/python-jsonrpc-server" -distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" -checksum=62c543e541f101ec5b57dc654efc212d2c2e3ea47ff6f54b2e7dcb36ecf20595 - -post_patch() { - vsed -i setup.py -e 's/\bujson<=1\.35\b/ujson/' -} - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index d5a5e66b8b1a77..a76ad553cbf391 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=67 +revision=68 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -325,6 +325,7 @@ replaces=" python3-docker-pycreds<=0.4.0_4 python3-grako<=3.99.9_7 python3-idna-ssl<=1.1.0_3 + python3-jsonrpc-server<=0.4.0_2 python3-keepalive<=0.5_6 python3-pgpdump<=1.5_10 python3-lockfile<=0.12.2_7