From 93d03e99f4df4b98fc4c111b82175face649e966 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 23 Jul 2021 15:35:31 +0200 Subject: [PATCH] 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 --- dev-python/python-lsp-server/metadata.xml | 3 +++ ....ebuild => python-lsp-server-1.0.1-r1.ebuild} | 16 +++++++++++++++- ....ebuild => python-lsp-server-1.1.0-r1.ebuild} | 16 +++++++++++++++- 3 files changed, 33 insertions(+), 2 deletions(-) rename dev-python/python-lsp-server/{python-lsp-server-1.0.1.ebuild => python-lsp-server-1.0.1-r1.ebuild} (80%) rename dev-python/python-lsp-server/{python-lsp-server-1.1.0.ebuild => python-lsp-server-1.1.0-r1.ebuild} (80%) diff --git a/dev-python/python-lsp-server/metadata.xml b/dev-python/python-lsp-server/metadata.xml index d18c2963a96b8..bad826ef127c3 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 6acffdf397b91..664b3167fc9e2 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 7bfbc16308b2a..a81825d5a49e5 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