Re: python-lsp-server new upstream version
"Aeliton G. Silva" <[email protected]>
| Newsgroups | gmane.linux.debian.devel.python |
|---|---|
| Message-ID | <[email protected]> |
On Sat, 2025-11-22 at 14:03 +0500, Andrey Rakhmatullin wrote: > > No, the upload to Debian archive is only done by your sponsor. > > > > > Push your repo to salsa.debian.org: > > This is not about uploading to the archive. > Thanks for the clarifications Andrey. About pushing it to salsa, can I do it or this should also be done by a sponsor? > > And is the tagging that I should not do what the wiki says in the > > tagging section? > > > > > > $ gbp buildpackage --git-tag-only > > $ git push --tags > > Yes. Roger. > > > > > > > Can you test if this is a test only dependency and can be > > > annotated > > > with <!nocheck>? > > > > > > > Good shout, thanks. websockets are in the [project.optional- > > dependencies] in the pyproject.toml of the upstream, so I assume it > > should be annotated with <!nocheck>. > > What matters is whether it's used for building or just for testing > and > whether the package builds fine with the nocheck build profile after > your > changes. You shouldn't just guess. If I remove either black or python3-websockets from debian/control, gbp buildpackage will succeed creating python_lsp_server-1.13.2-py3-none- any.whl, but the test session will fail when any of the packages is not installed. The debian package builds normally after annotating both dependencies with <!nocheck>. Rebuilding the package with pbuilder [1] is also successful. Updated patches are attached. 1- https://www.debian.org/doc/manuals/maint-guide/build.en.html#pbuilder
0007-Update-changelog-for-1.13.2-1-release.patch
(text/x-patch, 881 B)
From 5e6d8a5e53d696ebda365cd9a2a5a0a056dda808 Mon Sep 17 00:00:00 2001 From: Aeliton Silva <[email protected]> Date: Sat, 22 Nov 2025 12:26:11 -0300 Subject: [PATCH 7/7] Update changelog for 1.13.2-1 release --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2c2b643..df84c72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +python-lsp-server (1.13.2-1) UNRELEASED; urgency=medium + + * New upstream version 1.13.2 + * Rediff patches + * Fix test to work with jedi 0.19.1 + * Add black as a build dependency + * Update to pyqt6 + * Add python3-websockets as build dependency + * Skip faulty test + + -- Aeliton Silva <[email protected]> Sat, 22 Nov 2025 12:25:51 -0300 + python-lsp-server (1.12.0-3) unstable; urgency=medium * Increase test timeout -- 2.51.0
0006-Skip-faulty-test.patch
(text/x-patch, 729 B)
From a391fec44c4d414c96f9cf1230326c83f8fe8e16 Mon Sep 17 00:00:00 2001 From: Aeliton Silva <[email protected]> Date: Fri, 21 Nov 2025 17:53:23 -0300 Subject: [PATCH 6/7] Skip faulty test --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 69489e2..cc82f53 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ undefine CI # test_per_file_caching and test_per_file_caching: fails during build -export PYBUILD_TEST_ARGS = -k "not test_lint_free_pylint and not test_per_file_caching" +export PYBUILD_TEST_ARGS = -k "not test_lint_free_pylint and not test_per_file_caching and not test_missing_message" %: dh $@ --buildsystem=pybuild -- 2.51.0
0005-Add-python3-websockets-as-build-dependency.patch
(text/x-patch, 735 B)
From 7be1e8ddfa25ccfe9f7f18d013e781e1c8217fe7 Mon Sep 17 00:00:00 2001 From: Aeliton Silva <[email protected]> Date: Fri, 21 Nov 2025 05:14:56 -0300 Subject: [PATCH 5/7] Add python3-websockets as build dependency --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 9ef0cef..a9ccad8 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,7 @@ Build-Depends: black <!nocheck>, python3-setuptools, python3-setuptools-scm, python3-ujson, + python3-websockets <!nocheck>, python3-whatthepatch (>= 1.0.2) <!nocheck>, python3-yapf <!nocheck> Standards-Version: 4.7.0 -- 2.51.0
0004-Update-to-pyqt6.patch
(text/x-patch, 788 B)
From f65077048d00f87c1b7ca346ae1fe8a329b1ba5a Mon Sep 17 00:00:00 2001 From: Aeliton Silva <[email protected]> Date: Fri, 21 Nov 2025 05:14:41 -0300 Subject: [PATCH 4/7] Update to pyqt6 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index cbe7904..9ef0cef 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: black <!nocheck>, python3-pluggy (>= 1.0.0), python3-pydocstyle (>= 6.3.0) <!nocheck>, python3-pylsp-jsonrpc, - python3-pyqt5 <!nocheck>, + python3-pyqt6 <!nocheck>, python3-pytest <!nocheck>, python3-rope <!nocheck>, python3-setuptools, -- 2.51.0
0003-Add-black-as-a-build-dependency.patch
(text/x-patch, 870 B)
From 0eabab41a526dff5f907a7f724b5acd79fdf2b0a Mon Sep 17 00:00:00 2001 From: Aeliton Silva <[email protected]> Date: Fri, 21 Nov 2025 05:14:11 -0300 Subject: [PATCH 3/7] Add black as a build dependency --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b052494..cbe7904 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,8 @@ Maintainer: Debian Python Team <[email protected]> Uploaders: Pablo Mestre Drake <[email protected]>, Julian Gilbey <[email protected]>, Jochen Sprickerhof <[email protected]> -Build-Depends: debhelper-compat (= 13), +Build-Depends: black <!nocheck>, + debhelper-compat (= 13), dh-sequence-python3, flake8 <!nocheck>, pybuild-plugin-pyproject, -- 2.51.0
0002-Fix-test-to-work-with-jedi-0.19.1.patch
(text/x-patch, 1.9 KB)
From e4a7ca32ea1a10b59afff6dfd672019d88e40744 Mon Sep 17 00:00:00 2001 From: Aeliton Silva <[email protected]> Date: Sat, 22 Nov 2025 12:24:17 -0300 Subject: [PATCH 2/7] Fix test to work with jedi 0.19.1 --- ...03-Fix-test-to-work-with-jedi-0.19.1.patch | 26 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 27 insertions(+) create mode 100644 debian/patches/0003-Fix-test-to-work-with-jedi-0.19.1.patch diff --git a/debian/patches/0003-Fix-test-to-work-with-jedi-0.19.1.patch b/debian/patches/0003-Fix-test-to-work-with-jedi-0.19.1.patch new file mode 100644 index 0000000..dd94fbc --- /dev/null +++ b/debian/patches/0003-Fix-test-to-work-with-jedi-0.19.1.patch @@ -0,0 +1,26 @@ +From: Aeliton Silva <[email protected]> +Date: Sat, 22 Nov 2025 12:22:11 -0300 +Subject: Fix test to work with jedi 0.19.1 + +The change to jedi 0.19.2 sorts the completion list [1]. + +The current jedi version in sid is 0.19.1. + +1. https://github.com/python-lsp/python-lsp-server/pull/609 +--- + test/plugins/test_completion.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py +index 015d0c4..ae5021f 100644 +--- a/test/plugins/test_completion.py ++++ b/test/plugins/test_completion.py +@@ -181,7 +181,7 @@ def test_jedi_completion_with_fuzzy_enabled(config, workspace) -> None: + + assert items + +- expected = "isabs(s)" ++ expected = "commonprefix(m)" if JEDI_VERSION < "0.19.2" else "isabs(s)" + assert items[0]["label"] == expected + + # Test we don't throw with big character diff --git a/debian/patches/series b/debian/patches/series index 583ee73..966f9c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0002-Disable-coverage-report.patch 0002-Increase-test-timeout.patch +0003-Fix-test-to-work-with-jedi-0.19.1.patch -- 2.51.0
0001-Rediff-patches.patch
(text/x-patch, 1.9 KB)
From 7f803c82f9ad8952e62d017aee2bd780f866f751 Mon Sep 17 00:00:00 2001 From: Aeliton Silva <[email protected]> Date: Sat, 22 Nov 2025 12:23:32 -0300 Subject: [PATCH 1/7] Rediff patches --- debian/patches/0002-Disable-coverage-report.patch | 4 ++-- debian/patches/0002-Increase-test-timeout.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/0002-Disable-coverage-report.patch b/debian/patches/0002-Disable-coverage-report.patch index 34dad47..f3e6030 100644 --- a/debian/patches/0002-Disable-coverage-report.patch +++ b/debian/patches/0002-Disable-coverage-report.patch @@ -7,10 +7,10 @@ Subject: Disable coverage report 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index f9c6a52..7573d3e 100644 +index 0be4035..96ab95a 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -180,7 +180,6 @@ write_to_template = "__version__ = \"{version}\"\n" # VERSION_INFO is populated +@@ -183,7 +183,6 @@ write_to_template = "__version__ = \"{version}\"\n" # VERSION_INFO is populated [tool.pytest.ini_options] testpaths = ["test"] diff --git a/debian/patches/0002-Increase-test-timeout.patch b/debian/patches/0002-Increase-test-timeout.patch index bee8306..20626cf 100644 --- a/debian/patches/0002-Increase-test-timeout.patch +++ b/debian/patches/0002-Increase-test-timeout.patch @@ -8,7 +8,7 @@ Was failing on arm64 and i386 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_utils.py b/test/test_utils.py -index 07d04e3..4983d29 100644 +index 7ed6214..1d8b25e 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -16,7 +16,7 @@ from pylsp import _utils @@ -19,4 +19,4 @@ index 07d04e3..4983d29 100644 +CALL_TIMEOUT_IN_SECONDS = 60 - def send_notebook_did_open(client, cells: List[str]) -> None: + def send_notebook_did_open(client, cells: list[str]) -> None: -- 2.51.0