Skip to content

Commit ed27ec5

Browse files
bnavigatorbmwiedemann
authored andcommitted
Update python-python-lsp-server to version 1.7.1 / rev 19 via SR 1059822
https://build.opensuse.org/request/show/1059822 by user bnavigator + dimstar_suse - Update to 1.7.1 * Fixes an error with the Pydocstyle 6.2.0+ * Includes missing Pylint "information" category. * Improves Jedi file completions for directories. - Drop python-lsp-server-pr327-sys-executable.patch - Add pylsp-pr340-pydocstyle-6.3.patch gh#python-lsp/python-lsp-server#340 (forwarded request 1059821 from bnavigator)
1 parent e02d8c1 commit ed27ec5

8 files changed

+93
-22
lines changed
-12 Bytes
Binary file not shown.

packages/p/python-python-lsp-server/.rev

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,18 @@
188188
* gh#python-lsp/python-lsp-server#327 (forwarded request 1045987 from bnavigator)</comment>
189189
<requestid>1045989</requestid>
190190
</revision>
191+
<revision rev="19" vrev="1">
192+
<srcmd5>b9a1bdbd28de1f19c7a6bacfeb0f3db5</srcmd5>
193+
<version>1.7.1</version>
194+
<time>1674232714</time>
195+
<user>dimstar_suse</user>
196+
<comment>- Update to 1.7.1
197+
* Fixes an error with the Pydocstyle 6.2.0+
198+
* Includes missing Pylint &quot;information&quot; category.
199+
* Improves Jedi file completions for directories.
200+
- Drop python-lsp-server-pr327-sys-executable.patch
201+
- Add pylsp-pr340-pydocstyle-6.3.patch
202+
gh#python-lsp/python-lsp-server#340 (forwarded request 1059821 from bnavigator)</comment>
203+
<requestid>1059822</requestid>
204+
</revision>
191205
</revisionlist>
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
diff --git a/pylsp/plugins/pydocstyle_lint.py b/pylsp/plugins/pydocstyle_lint.py
2+
index 0aa72b7..2e34ccc 100644
3+
--- a/pylsp/plugins/pydocstyle_lint.py
4+
+++ b/pylsp/plugins/pydocstyle_lint.py
5+
@@ -28,6 +28,7 @@ def pylsp_settings():
6+
7+
@hookimpl
8+
def pylsp_lint(config, workspace, document):
9+
+ # pylint: disable=too-many-locals
10+
with workspace.report_progress("lint: pydocstyle"):
11+
settings = config.plugin_settings('pydocstyle', document_path=document.path)
12+
log.debug("Got pydocstyle settings: %s", settings)
13+
@@ -66,9 +67,19 @@ def pylsp_lint(config, workspace, document):
14+
15+
# Will only yield a single filename, the document path
16+
diags = []
17+
- for filename, checked_codes, ignore_decorators, property_decorators in conf.get_files_to_check():
18+
+ for (
19+
+ filename,
20+
+ checked_codes,
21+
+ ignore_decorators,
22+
+ property_decorators,
23+
+ ignore_self_only_init,
24+
+ ) in conf.get_files_to_check():
25+
errors = pydocstyle.checker.ConventionChecker().check_source(
26+
- document.source, filename, ignore_decorators=ignore_decorators, property_decorators=property_decorators
27+
+ document.source,
28+
+ filename,
29+
+ ignore_decorators=ignore_decorators,
30+
+ property_decorators=property_decorators,
31+
+ ignore_self_only_init=ignore_self_only_init,
32+
)
33+
34+
try:
35+
diff --git a/pyproject.toml b/pyproject.toml
36+
index 8d38434..841638a 100644
37+
--- a/pyproject.toml
38+
+++ b/pyproject.toml
39+
@@ -31,7 +31,7 @@ all = [
40+
"flake8>=5.0.0,<7",
41+
"mccabe>=0.7.0,<0.8.0",
42+
"pycodestyle>=2.9.0,<2.11.0",
43+
- "pydocstyle>=6.2.0,<6.3.0",
44+
+ "pydocstyle>=6.3.0,<6.4.0",
45+
"pyflakes>=2.5.0,<3.1.0",
46+
"pylint>=2.5.0,<3",
47+
"rope>1.2.0",
48+
@@ -42,7 +42,7 @@ autopep8 = ["autopep8>=1.6.0,<1.7.0"]
49+
flake8 = ["flake8>=5.0.0,<7"]
50+
mccabe = ["mccabe>=0.7.0,<0.8.0"]
51+
pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"]
52+
-pydocstyle = ["pydocstyle>=6.2.0,<6.3.0"]
53+
+pydocstyle = ["pydocstyle>=6.3.0,<6.4.0"]
54+
pyflakes = ["pyflakes>=2.5.0,<3.1.0"]
55+
pylint = ["pylint>=2.5.0,<3"]
56+
rope = ["rope>1.2.0"]

packages/p/python-python-lsp-server/python-lsp-server-1.7.0.tar.gz

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/ipfs/bafkreidhi453gaptkq2ll6uleh6f5vp2yj64rkcenthmroxek2xvfifo6y

packages/p/python-python-lsp-server/python-lsp-server-pr327-sys-executable.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/p/python-python-lsp-server/python-python-lsp-server.changes

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
-------------------------------------------------------------------
2+
Thu Jan 19 10:10:31 UTC 2023 - Ben Greiner <[email protected]>
3+
4+
- Update to 1.7.1
5+
* Fixes an error with the Pydocstyle 6.2.0+
6+
* Includes missing Pylint "information" category.
7+
* Improves Jedi file completions for directories.
8+
- Drop python-lsp-server-pr327-sys-executable.patch
9+
- Add pylsp-pr340-pydocstyle-6.3.patch
10+
gh#python-lsp/python-lsp-server#340
11+
112
-------------------------------------------------------------------
213
Fri Dec 30 09:46:15 UTC 2022 - Ben Greiner <[email protected]>
314

packages/p/python-python-lsp-server/python-python-lsp-server.spec

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818

1919
Name: python-python-lsp-server
20-
Version: 1.7.0
20+
Version: 1.7.1
2121
Release: 0
2222
Summary: Python Language Server for the Language Server Protocol
2323
License: MIT
2424
URL: https://github.com/python-lsp/python-lsp-server
2525
Source: https://files.pythonhosted.org/packages/source/p/python-lsp-server/python-lsp-server-%{version}.tar.gz
26-
# PATCH-FIX-UPSTREAM python-lsp-server-pr327-sys-executable.patch gh#python-lsp/python-lsp-server#327
27-
Patch1: python-lsp-server-pr327-sys-executable.patch
26+
# PATCH-FIX-UPSTREAM pylsp-pr340-pydocstyle-6.3.patch gh#python-lsp/python-lsp-server#340
27+
Patch1: pylsp-pr340-pydocstyle-6.3.patch
2828
BuildRequires: %{python_module base >= 3.7}
2929
BuildRequires: %{python_module pip}
3030
BuildRequires: %{python_module setuptools >= 61.2}
@@ -43,13 +43,13 @@ BuildRequires: %{python_module matplotlib}
4343
BuildRequires: %{python_module numpy}
4444
BuildRequires: %{python_module pandas}
4545
BuildRequires: %{python_module pluggy}
46-
BuildRequires: %{python_module pydocstyle >= 2.0.0}
47-
BuildRequires: %{python_module pylint >= 2.5.0}
46+
BuildRequires: %{python_module pydocstyle >= 6.3.0 with %python-pydocstyle < 6.4.0}
47+
BuildRequires: %{python_module pylint >= 2.5.0 with %python-pylint < 3}
4848
BuildRequires: %{python_module pytest}
4949
BuildRequires: %{python_module python-lsp-jsonrpc >= 1.0.0}
5050
BuildRequires: %{python_module rope >= 1.2.0}
5151
BuildRequires: %{python_module ujson >= 3.0.0}
52-
BuildRequires: %{python_module whatthepatch}
52+
BuildRequires: %{python_module whatthepatch >= 1.0.2 with %python-whatthepatch < 2}
5353
BuildRequires: %{python_module yapf}
5454
# /SECTION
5555
BuildRequires: fdupes
@@ -61,11 +61,14 @@ Requires: python-ujson >= 3.0.0
6161
Requires: (python-jedi >= 0.17.2 with python-jedi < 0.19.0)
6262
Suggests: python-autopep8 >= 1.6.0
6363
Conflicts: python-autopep8 >= 1.7.0
64-
Suggests: python-pydocstyle >= 2.0.0
64+
Suggests: python-pydocstyle >= 6.3.0
65+
Conflicts: python-pydocstyle >= 6.4.0
6566
Suggests: python-pylint >= 2.5.0
67+
Conflicts: python-pylint >= 3
6668
Suggests: python-rope >= 1.2.0
6769
Suggests: python-yapf
68-
Suggests: python-whatthepatch
70+
Suggests: python-whatthepatch >= 1.0.2
71+
Conflicts: python-whatthepatch >= 2
6972
# SECTION flake8 pins
7073
Suggests: python-flake8 >= 5.0.0
7174
Conflicts: python-flake8 >= 7

0 commit comments

Comments
 (0)