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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25D72139345 for ; Fri, 23 Jul 2021 13:49:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44E42E0BDF; Fri, 23 Jul 2021 13:49:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 19F8AE0BDF for ; Fri, 23 Jul 2021 13:49:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BD9F342A9A for ; Fri, 23 Jul 2021 13:49:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD0075C4 for ; Fri, 23 Jul 2021 13:49:14 +0000 (UTC) From: "Andrew 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, "Andrew Ammerlaan" Message-ID: <1627048147.93d03e99f4df4b98fc4c111b82175face649e966.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-lsp-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/python-lsp-server/metadata.xml dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild X-VCS-Directories: dev-python/python-lsp-server/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 93d03e99f4df4b98fc4c111b82175face649e966 X-VCS-Branch: master Date: Fri, 23 Jul 2021 13:49:14 +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: 4fbe3b87-ab28-46ec-a57a-bb11361fdfc5 X-Archives-Hash: 374ef31a3803efdcba22c1a5c9f425df commit: 93d03e99f4df4b98fc4c111b82175face649e966 Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri Jul 23 13:35:31 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Jul 23 13:49:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d03e99 dev-python/python-lsp-server: introduce all-plugins USE flag Spyder requires all optional plugins for pylsp to be installed. Previously we handled this in the spyder ebuild. However, different versions of pylsp can be (in)compatible with different versions of these plugins. Which means that we run into problems with spyder if the version dependecny information for version X is recorded in the spyder ebuild, but version Y of pylsp is installed. The obvious solution is to record these dependencies in the pylsp ebuild instead, however to not pull in *everything* unconditionally we also introduce the USE flag. Package-Manager: Portage-3.0.20, Repoman-3.0.3 RepoMan-Options: --force Signed-off-by: Andrew Ammerlaan gentoo.org> dev-python/python-lsp-server/metadata.xml | 3 +++ ...er-1.0.1.ebuild => python-lsp-server-1.0.1-r1.ebuild} | 16 +++++++++++++++- ...er-1.1.0.ebuild => python-lsp-server-1.1.0-r1.ebuild} | 16 +++++++++++++++- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dev-python/python-lsp-server/metadata.xml b/dev-python/python-lsp-server/metadata.xml index d18c2963a96..bad826ef127 100644 --- a/dev-python/python-lsp-server/metadata.xml +++ b/dev-python/python-lsp-server/metadata.xml @@ -13,4 +13,7 @@ python-lsp-server + + Pull in all optional plugins + diff --git a/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild similarity index 80% rename from dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild rename to dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild index 6acffdf397b..664b3167fc9 100644 --- a/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild +++ b/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild @@ -16,6 +16,8 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~arm64 x86" +IUSE="all-plugins" + BDEPEND=" test? ( dev-python/autopep8[${PYTHON_USEDEP}] @@ -41,7 +43,19 @@ RDEPEND=" =dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}] dev-python/pluggy[${PYTHON_USEDEP}] - >=dev-python/ujson-3[${PYTHON_USEDEP}] + all-plugins? ( + dev-python/autopep8[${PYTHON_USEDEP}] + >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}] + >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}] + =dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}] + >=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}] + >=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}] + =dev-python/pylint-2.5.0[${PYTHON_USEDEP}] + >=dev-python/rope-0.10.5[${PYTHON_USEDEP}] + dev-python/yapf[${PYTHON_USEDEP}] + ) " PATCHES=( diff --git a/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild similarity index 80% rename from dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild rename to dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild index 7bfbc16308b..a81825d5a49 100644 --- a/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild +++ b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild @@ -16,6 +16,8 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="all-plugins" + BDEPEND=" test? ( dev-python/autopep8[${PYTHON_USEDEP}] @@ -41,7 +43,19 @@ RDEPEND=" =dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}] dev-python/pluggy[${PYTHON_USEDEP}] - >=dev-python/ujson-3[${PYTHON_USEDEP}] + all-plugins? ( + dev-python/autopep8[${PYTHON_USEDEP}] + >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}] + >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}] + =dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}] + >=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}] + >=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}] + =dev-python/pylint-2.5.0[${PYTHON_USEDEP}] + >=dev-python/rope-0.10.5[${PYTHON_USEDEP}] + dev-python/yapf[${PYTHON_USEDEP}] + ) " distutils_enable_tests pytest