From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C95A015812D for ; Thu, 02 Jan 2025 15:20:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0018E081E; Thu, 02 Jan 2025 15:20:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 173F3E081E for ; Thu, 02 Jan 2025 15:20:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0618533FE60 for ; Thu, 02 Jan 2025 15:20:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67CC21909 for ; Thu, 02 Jan 2025 15:20:47 +0000 (UTC) From: "Nowa Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nowa Ammerlaan" Message-ID: <1735831193.340bf29453b14d83a7c869a189fa05e0209f5e89.nowa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-lsp-server/files/, dev-python/python-lsp-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/python-lsp-server/files/python-lsp-server-1.12.0-jedi19-compat.patch dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild X-VCS-Directories: dev-python/python-lsp-server/ dev-python/python-lsp-server/files/ X-VCS-Committer: nowa X-VCS-Committer-Name: Nowa Ammerlaan X-VCS-Revision: 340bf29453b14d83a7c869a189fa05e0209f5e89 X-VCS-Branch: master Date: Thu, 02 Jan 2025 15:20:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3ad5d078-a585-452b-b8d6-95ca22985cc6 X-Archives-Hash: bac6cc9fd7e5abc03509a3f0a9bb34a5 commit: 340bf29453b14d83a7c869a189fa05e0209f5e89 Author: Nowa Ammerlaan gentoo org> AuthorDate: Thu Jan 2 14:38:23 2025 +0000 Commit: Nowa Ammerlaan gentoo org> CommitDate: Thu Jan 2 15:19:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340bf294 dev-python/python-lsp-server: patch and enable python 3.13 Closes: https://bugs.gentoo.org/943312 Signed-off-by: Nowa Ammerlaan gentoo.org> .../python-lsp-server-1.12.0-jedi19-compat.patch | 16 ++++ .../python-lsp-server-1.12.0-r1.ebuild | 95 ++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.12.0-jedi19-compat.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.12.0-jedi19-compat.patch new file mode 100644 index 000000000000..b5dd4c352dbb --- /dev/null +++ b/dev-python/python-lsp-server/files/python-lsp-server-1.12.0-jedi19-compat.patch @@ -0,0 +1,16 @@ +https://github.com/python-lsp/python-lsp-server/pull/609 +diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py +index d1ca5ef8..3e768f06 100644 +--- a/test/plugins/test_completion.py ++++ b/test/plugins/test_completion.py +@@ -179,9 +179,7 @@ def test_jedi_completion_with_fuzzy_enabled(config, workspace) -> None: + + assert items + +- expected = "commonprefix(m)" +- if JEDI_VERSION == "0.18.0": +- expected = "commonprefix(list)" ++ expected = "isabs(s)" + assert items[0]["label"] == expected + + # Test we don't throw with big character diff --git a/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild new file mode 100644 index 000000000000..8a673c456491 --- /dev/null +++ b/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) + +inherit distutils-r1 optfeature pypi + +DESCRIPTION="Python Language Server for the Language Server Protocol" +HOMEPAGE=" + https://github.com/python-lsp/python-lsp-server/ + https://pypi.org/project/python-lsp-server/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="all-plugins" + +PLUGIN_DEP=" + >=dev-python/autopep8-2.0.4[${PYTHON_USEDEP}] + >=dev-python/flake8-7.1[${PYTHON_USEDEP}] + >=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}] + >=dev-python/pycodestyle-2.12.0[${PYTHON_USEDEP}] + >=dev-python/pyflakes-3.2.0[${PYTHON_USEDEP}] + >=dev-python/pylint-3.1[${PYTHON_USEDEP}] + >=dev-python/rope-1.11.0[${PYTHON_USEDEP}] + >=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}] + >=dev-python/yapf-0.33.0[${PYTHON_USEDEP}] +" +RDEPEND=" + dev-python/docstring-to-markdown[${PYTHON_USEDEP}] + >=dev-python/jedi-0.17.2[${PYTHON_USEDEP}] + >=dev-python/python-lsp-jsonrpc-1.1.0[${PYTHON_USEDEP}] + dev-python/pluggy[${PYTHON_USEDEP}] + all-plugins? ( + ${PLUGIN_DEP} + ) +" +BDEPEND=" + test? ( + ${PLUGIN_DEP} + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] + dev-python/qtpy[gui,testlib,${PYTHON_USEDEP}] + ) +" + +PATCHES=( + # https://github.com/python-lsp/python-lsp-server/pull/609 + "${FILESDIR}/${PN}-1.12.0-jedi19-compat.patch" +) + +# Note: xdist breaks some tests +distutils_enable_tests pytest + +python_prepare_all() { + # remove pytest-cov dep + sed -i -e '/addopts =/d' pyproject.toml || die + # unpin all the deps + sed -i -e 's:,<[0-9.]*::' pyproject.toml || die + distutils-r1_python_prepare_all +} + +python_test() { + local EPYTEST_DESELECT=( + # broken by presence of pathlib2 + 'test/plugins/test_autoimport.py' + # Requires pyqt5 + 'test/plugins/test_completion.py::test_pyqt_completion' + ) + local EPYTEST_IGNORE=( + # pydocstyle is archived upstream and broken with py3.12 + test/plugins/test_pydocstyle_lint.py + ) + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest +} + +pkg_postinst() { + optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8 + optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8 + optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe + optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle + optfeature "Python docstring style checker" dev-python/pydocstyle + optfeature "Passive checker for Python programs" dev-python/pyflakes + optfeature "Python code static checker" dev-python/pylint + optfeature "Python refactoring library" dev-python/rope + optfeature "A formatter for Python files" dev-python/yapf +}