python3-language-server: fix compatibility with jedi 0.18.0
Project seems to be unmaintained at the moment. There's an active fork at https://github.com/python-lsp/python-lsp-server that we can switch to in future.
This commit is contained in:
parent
0d362a489a
commit
92e3f5403d
|
@ -0,0 +1,37 @@
|
||||||
|
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"',
|
|
@ -1,17 +1,24 @@
|
||||||
# Template file for 'python3-language-server'
|
# Template file for 'python3-language-server'
|
||||||
pkgname=python3-language-server
|
pkgname=python3-language-server
|
||||||
version=0.36.1
|
version=0.36.1
|
||||||
revision=1
|
revision=2
|
||||||
wrksrc="${pkgname/3}-${version}"
|
wrksrc="${pkgname/3}-${version}"
|
||||||
build_style=python3-module
|
build_style=python3-module
|
||||||
hostmakedepends="python3-setuptools"
|
hostmakedepends="python3-setuptools"
|
||||||
depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson"
|
depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson"
|
||||||
|
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"
|
short_desc="Python implementation of the Language Server Protocol"
|
||||||
maintainer="k4leg <d0xi@inbox.ru>"
|
maintainer="k4leg <d0xi@inbox.ru>"
|
||||||
license="MIT"
|
license="MIT"
|
||||||
homepage="https://github.com/palantir/python-language-server"
|
homepage="https://github.com/palantir/python-language-server"
|
||||||
distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
|
distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
|
||||||
checksum=c85d718ef6860319ad59fd6f2acb1166e9349b782ee8e8908e08ecf241615f52
|
checksum=c85d718ef6860319ad59fd6f2acb1166e9349b782ee8e8908e08ecf241615f52
|
||||||
|
# Needs unpackaged rope and versioneer
|
||||||
|
# https://github.com/palantir/python-language-server/blob/develop/setup.py#L51
|
||||||
|
make_check=no
|
||||||
|
|
||||||
post_patch() {
|
post_patch() {
|
||||||
vsed -i setup.py -e 's/\bujson<=1.35\b/ujson/'
|
vsed -i setup.py -e 's/\bujson<=1.35\b/ujson/'
|
||||||
|
|
Loading…
Reference in New Issue