diff --git a/allow-pylint4.patch b/allow-pylint4.patch new file mode 100644 index 0000000..2ab47ee --- /dev/null +++ b/allow-pylint4.patch @@ -0,0 +1,37 @@ +From d20ec4adb5f2ebe9eb8075b5933ea3190f6e6665 Mon Sep 17 00:00:00 2001 +From: nkrapp +Date: Tue, 18 Nov 2025 11:09:38 +0100 +Subject: [PATCH] bump allowed pylint to <4.1 + +--- + pyproject.toml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 0be4035c..8fe9c574 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -35,7 +35,7 @@ all = [ + "pycodestyle>=2.12.0,<2.13.0", + "pydocstyle>=6.3.0,<6.4.0", + "pyflakes>=3.2.0,<3.3.0", +- "pylint>=3.1,<4", ++ "pylint>=3.1,<4.1.0", + "rope>=1.11.0", + "yapf>=0.33.0", + "whatthepatch>=1.0.2,<2.0.0" +@@ -46,12 +46,12 @@ mccabe = ["mccabe>=0.7.0,<0.8.0"] + pycodestyle = ["pycodestyle>=2.12.0,<2.13.0"] + pydocstyle = ["pydocstyle>=6.3.0,<6.4.0"] + pyflakes = ["pyflakes>=3.2.0,<3.3.0"] +-pylint = ["pylint>=3.1,<4"] ++pylint = ["pylint>=3.1,<4.1.0"] + rope = ["rope>=1.11.0"] + yapf = ["yapf>=0.33.0", "whatthepatch>=1.0.2,<2.0.0"] + websockets = ["websockets>=10.3"] + test = [ +- "pylint>=3.1,<4", ++ "pylint>=3.1,<4.1.0", + "pytest", + "pytest-cov", + "coverage", diff --git a/python-python-lsp-server.changes b/python-python-lsp-server.changes index 8b65967..31b57a2 100644 --- a/python-python-lsp-server.changes +++ b/python-python-lsp-server.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Nov 17 09:32:52 UTC 2025 - Nico Krapp + +- Update to 1.13.1 + * Use PyQt6 for testing + * Expose a shutdown hook + * Copy LAST_JEDI_COMPLETIONS to cell document so that completionItem/resolve + will work +- add allow-pylint4.patch to allow new pylint version +- enable PyQt test again as upstream moved to PyQt6 +- disable test that hangs + (see: https://github.com/python-lsp/python-lsp-server/issues/679) +- use libalternatives on newer releases + ------------------------------------------------------------------- Wed Jul 23 08:29:46 UTC 2025 - Ben Greiner diff --git a/python-python-lsp-server.spec b/python-python-lsp-server.spec index 877e9e8..d1a0f36 100644 --- a/python-python-lsp-server.spec +++ b/python-python-lsp-server.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-lsp-server # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,23 @@ # +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + %{?sle15_python_module_pythons} Name: python-python-lsp-server -Version: 1.13.0 +Version: 1.13.1 Release: 0 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 Patch1: unpin-autopep8.patch +# PATCH-FIX-UPSTREAM allow-pylint4.patch https://github.com/python-lsp/python-lsp-server/pull/687 +Patch2: allow-pylint4.patch BuildRequires: %{python_module base >= 3.9} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 61.2} @@ -33,6 +41,7 @@ BuildRequires: %{python_module wheel} BuildRequires: python-rpm-macros >= 20210628 # SECTION test requirements BuildRequires: %{python_module autopep8 >= 2.0.4} +BuildRequires: %{python_module PyQt6} BuildRequires: %{python_module black} BuildRequires: %{python_module docstring-to-markdown} BuildRequires: %{python_module flaky} @@ -43,7 +52,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 >= 3.1 with %python-pylint < 4} +BuildRequires: %{python_module pylint >= 3.1 with %python-pylint < 4.1} 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} @@ -68,8 +77,13 @@ Requires: (python-python-lsp-jsonrpc >= 1.1.0 with python-python-lsp-jsonr Requires: python-importlib_metadata >= 4.8.3 %endif BuildArch: noarch +%if %{with libalternatives} +Requires: alts +BuildRequires: alts +%else Requires(post): update-alternatives Requires(postun): update-alternatives +%endif %python_subpackages %description @@ -95,7 +109,7 @@ Requires: python-autopep8 >= 2.0.4 Requires: python-rope >= 1.2.0 Requires: python-yapf >= 0.33 Requires: (python-pydocstyle >= 6.3.0 with python-pydocstyle < 6.4.0) -Requires: (python-pylint >= 3.1 with python-pylint < 4) +Requires: (python-pylint >= 3.1 with python-pylint < 4.1) Requires: (python-whatthepatch >= 1.0.2 with python-whatthepatch < 2) # Let's bump this in sync with flake8 and ignore pylsp upstream being still behind # https://flake8.pycqa.org/en/latest/faq.html#why-does-flake8-use-ranges-for-its-dependencies @@ -130,8 +144,12 @@ sed -i pyproject.toml \ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# PyQt5 not maintained anymore. Reenable when upstream moves to PyQt6 -%pytest -k "not test_pyqt_completion" +# test_missing_message is hanging https://github.com/python-lsp/python-lsp-server/issues/679 +%pytest -k "not test_missing_message" + +%pre +# If libalternatives is used: Removing old update-alternatives entries. +%python_libalternatives_reset_alternative pylsp %post %python_install_alternative pylsp diff --git a/python_lsp_server-1.13.0.tar.gz b/python_lsp_server-1.13.0.tar.gz deleted file mode 100644 index 73cd583..0000000 --- a/python_lsp_server-1.13.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:378f26b63ecf4c10864de31de5e6da7ad639de9bd60a75d4110fea36fb8d0d69 -size 119147 diff --git a/python_lsp_server-1.13.1.tar.gz b/python_lsp_server-1.13.1.tar.gz new file mode 100644 index 0000000..6fc9b9b --- /dev/null +++ b/python_lsp_server-1.13.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfa3d6bbca3fc3e6d0137b27cd1eabee65783a8d4314c36e1e230c603419afa3 +size 120484