From 6bf6bf61663f4e86abbc5f7f8d732cb8208e78979fd3e9eee0cc0582039f6449 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Fri, 29 Mar 2024 10:56:49 +0000 Subject: [PATCH] Accepting request 1163514 from home:bnavigator:spyder - Add pylsp-pr543-pylint3.1.patch gh#python-lsp/python-lsp-server#531 OBS-URL: https://build.opensuse.org/request/show/1163514 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-lsp-server?expand=0&rev=58 --- pylsp-pr543-pylint3.1.patch | 37 ++++++++++++++++++++++++++++++++ python-python-lsp-server.changes | 6 ++++++ python-python-lsp-server.spec | 8 ++++--- 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 pylsp-pr543-pylint3.1.patch diff --git a/pylsp-pr543-pylint3.1.patch b/pylsp-pr543-pylint3.1.patch new file mode 100644 index 0000000..2bcacff --- /dev/null +++ b/pylsp-pr543-pylint3.1.patch @@ -0,0 +1,37 @@ +From fe9f359db1cc0f59e4703c69c97ed17f88916f5a Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Fri, 29 Mar 2024 11:26:58 +0100 +Subject: [PATCH] Bump pylint to 3.1 + +--- + pyproject.toml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 4665dcbe..89ffab66 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -33,7 +33,7 @@ all = [ + "pycodestyle>=2.11.0,<2.12.0", + "pydocstyle>=6.3.0,<6.4.0", + "pyflakes>=3.2.0,<3.3.0", +- "pylint>=2.5.0,<3.1", ++ "pylint>=3.1,<4", + "rope>=1.11.0", + "yapf>=0.33.0", + "whatthepatch>=1.0.2,<2.0.0" +@@ -44,12 +44,12 @@ mccabe = ["mccabe>=0.7.0,<0.8.0"] + pycodestyle = ["pycodestyle>=2.11.0,<2.12.0"] + pydocstyle = ["pydocstyle>=6.3.0,<6.4.0"] + pyflakes = ["pyflakes>=3.2.0,<3.3.0"] +-pylint = ["pylint>=2.5.0,<3.1"] ++pylint = ["pylint>=3.1,<4"] + rope = ["rope>=1.11.0"] + yapf = ["yapf>=0.33.0", "whatthepatch>=1.0.2,<2.0.0"] + websockets = ["websockets>=10.3"] + test = [ +- "pylint>=2.5.0,<3.1", ++ "pylint>=3.1,<4", + "pytest", + "pytest-cov", + "coverage", diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes index 27ea0d3..d205d2c 100644 --- a/python-python-lsp-server.changes +++ b/python-python-lsp-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 29 10:50:31 UTC 2024 - Ben Greiner + +- Add pylsp-pr543-pylint3.1.patch + gh#python-lsp/python-lsp-server#531 + ------------------------------------------------------------------- Sat Mar 16 12:52:02 UTC 2024 - Dirk Müller diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec index 8e265b7..b857038 100644 --- a/python-python-lsp-server.spec +++ b/python-python-lsp-server.spec @@ -25,6 +25,8 @@ Summary: Python Language Server for the Language Server Protocol License: MIT URL: https://github.com/python-lsp/python-lsp-server Source: https://files.pythonhosted.org/packages/source/p/python-lsp-server/python-lsp-server-%{version}.tar.gz +# PATCH-FIX-UPSTREAM pylsp-pr543-pylint3.1.patch gh#python-lsp/python-lsp-server#531 +Patch0: pylsp-pr543-pylint3.1.patch BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 61.2} @@ -44,7 +46,7 @@ BuildRequires: %{python_module numpy} BuildRequires: %{python_module pandas} BuildRequires: %{python_module pluggy} BuildRequires: %{python_module pydocstyle >= 6.3.0 with %python-pydocstyle < 6.4.0} -BuildRequires: %{python_module pylint >= 2.5.0 with %python-pylint < 3.1} +BuildRequires: %{python_module pylint >= 3.1 with %python-pylint < 4} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-lsp-jsonrpc >= 1.1.0 with %python-python-lsp-jsonrpc < 2} BuildRequires: %{python_module rope >= 1.2.0} @@ -65,8 +67,8 @@ Suggests: python-autopep8 >= 2.0.4 Conflicts: python-autopep8 >= 2.1.0 Suggests: python-pydocstyle >= 6.3.0 Conflicts: python-pydocstyle >= 6.4.0 -Suggests: python-pylint >= 2.5.0 -Conflicts: python-pylint >= 3.1 +Suggests: python-pylint >= 3.1 +Conflicts: python-pylint >= 4 Suggests: python-rope >= 1.2.0 Suggests: python-yapf >= 0.33 Suggests: python-whatthepatch >= 1.0.2