From: CameronNemo <CameronNemo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] python3 lsp server
Date: Sat, 02 Apr 2022 22:04:57 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36480@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]
There is a new pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages python3-lsp-server
https://github.com/void-linux/void-packages/pull/36480
python3 lsp server
- New package: python3-lsp-jsonrpc-1.0.0
- New package: python3-lsp-server-1.4.1
- python3-jsonrpc-server: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-lsp-server-36480.patch --]
[-- Type: text/x-diff, Size: 9249 bytes --]
From af10618567aae9aad296181d4d27740e63600929 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:54:44 -0700
Subject: [PATCH 1/3] 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 000000000000..1455aa108797
--- /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 <cnemo@tutanota.com>"
+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 c20f090a42f24abf787b6f859432942604818dc6 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:53:38 -0700
Subject: [PATCH 2/3] 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 000000000000..9054a5e99f7e
--- /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 52e7e3c59abe..000000000000
--- 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 <code@bnavigator.de>
-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 a443ec3fb514..000000000000
--- 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 <d0xi@inbox.ru>"
-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 000000000000..2d83baca12d8
--- /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"
+short_desc="Python implementation of the Language Server Protocol"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
+homepage="https://github.com/python-lsp/python-lsp-server"
+distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
+checksum=be7f83298af9f0951a93972cafc9db04fd7cf5c05f20812515275f0ba70e342f
+# requires an updated pluggy, but that causes pytest test failures
+make_check=no
+# the checkdepends would be:
+# 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"
+# and ignore these tests due to missing rope and pydocstyle deps:
+# test/plugins/test_completion.py
+# test/plugins/test_pydocstyle_lint.py
+# 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 065716b60875fbdcce9e45b8afeca7e5d96b2062 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:52:16 -0700
Subject: [PATCH 3/3] 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 de96976ad0a2..000000000000
--- 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 <d0xi@inbox.ru>"
-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 d5a5e66b8b1a..a76ad553cbf3 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 <chocimier@tlen.pl>"
@@ -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
next reply other threads:[~2022-04-02 20:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-02 20:04 CameronNemo [this message]
2022-04-02 21:42 ` [PR PATCH] [Updated] " CameronNemo
2022-04-02 21:44 ` CameronNemo
2022-04-06 21:34 ` [PR PATCH] [Merged]: " leahneukirchen
2022-09-06 1:34 [PR PATCH] " CameronNemo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36480@inbox.vuxu.org \
--to=cameronnemo@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).