diff options
Diffstat (limited to 'dev-python/python-lsp-black')
4 files changed, 132 insertions, 0 deletions
diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest new file mode 100644 index 000000000000..36f007d7773e --- /dev/null +++ b/dev-python/python-lsp-black/Manifest @@ -0,0 +1 @@ +DIST python-lsp-black-2.0.0.gh.tar.gz 10399 BLAKE2B e38bf7ae736b3b71c1e17dd34b7e98b9bcbdbc7a12e2c1596ccdbe13b8fac8caef8a1f043aa50e1688b9159928885b8b116b709b4d2574b8ddf77172df756862 SHA512 e374ea34ac53e0d78ba198814210d9d7293e18b8fc7b22bb288621a994c8c9d492cc9c99c40cd1574b618add518671430e1e88f32e93e4c95507373932c08dc0 diff --git a/dev-python/python-lsp-black/files/python-lsp-black-2.0.0-test.patch b/dev-python/python-lsp-black/files/python-lsp-black-2.0.0-test.patch new file mode 100644 index 000000000000..49ab792cded8 --- /dev/null +++ b/dev-python/python-lsp-black/files/python-lsp-black-2.0.0-test.patch @@ -0,0 +1,73 @@ +From d43b41431379f9c9bb05fab158c4d97e6d515f8f Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Date: Tue, 20 Feb 2024 07:44:20 +0100 +Subject: [PATCH] Make tests work with black 24.2.0 + +Closes: #55 +--- + tests/test_plugin.py | 18 ++++++++++++++++-- + +diff --git a/tests/test_plugin.py b/tests/test_plugin.py +index 0a51767..2ae8088 100644 +--- a/tests/test_plugin.py ++++ b/tests/test_plugin.py +@@ -281,7 +281,14 @@ def test_load_config_defaults(config): + + assert config == { + "line_length": 88, +- "target_version": set(), ++ "target_version": set( ++ [ ++ black.TargetVersion.PY38, ++ black.TargetVersion.PY39, ++ black.TargetVersion.PY310, ++ black.TargetVersion.PY311, ++ ] ++ ), + "pyi": False, + "fast": False, + "skip_magic_trailing_comma": False, +@@ -297,7 +304,14 @@ def test_load_config_with_skip_options(config_with_skip_options): + + assert config == { + "line_length": 88, +- "target_version": set(), ++ "target_version": set( ++ [ ++ black.TargetVersion.PY38, ++ black.TargetVersion.PY39, ++ black.TargetVersion.PY310, ++ black.TargetVersion.PY311, ++ ] ++ ), + "pyi": False, + "fast": False, + "skip_magic_trailing_comma": True, +From 9298585a9d14d25920c33b188d79e820dc98d4a9 Mon Sep 17 00:00:00 2001 +From: Anton Zhukharev <ancieg@altlinux.org> +Date: Tue, 9 Apr 2024 16:06:55 +0300 +Subject: [PATCH] Make tests work with black 24.3.0 + +Closes: #57 + +Black changed raising exception from AssertionError to ASTSafetyError +and we need to apply similar change. + +See: https://github.com/psf/black/commit/6af7d1109693c4ad3af08ecbc34649c232b47a6d +--- + pylsp_black/plugin.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pylsp_black/plugin.py b/pylsp_black/plugin.py +index e4fb9ba..5523896 100644 +--- a/pylsp_black/plugin.py ++++ b/pylsp_black/plugin.py +@@ -127,7 +127,7 @@ def format_text(*, text, config, lines): + IndentationError, + # raised when black produces invalid Python code or formats the file + # differently on the second pass +- AssertionError, ++ black.parsing.ASTSafetyError, + ) as e: + # errors will show on lsp stderr stream + logger.error("Error formatting with black: %s", e) diff --git a/dev-python/python-lsp-black/metadata.xml b/dev-python/python-lsp-black/metadata.xml new file mode 100644 index 000000000000..4ce7c8afee1d --- /dev/null +++ b/dev-python/python-lsp-black/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> +<pkgmetadata> + <stabilize-allarches /> + <maintainer type="person"> + <email>nowa@gentoo.org</email> + <name>Nowa Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> + <origin>baldeagleos-repo</origin> +</pkgmetadata> diff --git a/dev-python/python-lsp-black/python-lsp-black-2.0.0-r2.ebuild b/dev-python/python-lsp-black/python-lsp-black-2.0.0-r2.ebuild new file mode 100644 index 000000000000..e1c7dd9912b8 --- /dev/null +++ b/dev-python/python-lsp-black/python-lsp-black-2.0.0-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{13..14} ) + +inherit distutils-r1 + +DESCRIPTION="Black plugin for the Python LSP Server" +HOMEPAGE=" + https://github.com/python-lsp/python-lsp-black/ + https://pypi.org/project/python-lsp-black/ +" +SRC_URI=" + https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm64 x86" + +RDEPEND=" + >=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}] + >=dev-python/black-23.11.0[${PYTHON_USEDEP}] +" + +BDEPEND=" + test? ( + dev-python/pkg-resources[${PYTHON_USEDEP}] + !!<dev-python/python-lsp-black-2[${PYTHON_USEDEP}] + ) +" + +EPYTEST_PLUGINS=() +distutils_enable_tests pytest + +PATCHES=( + # https://github.com/python-lsp/python-lsp-black/pull/56 + # https://github.com/python-lsp/python-lsp-black/pull/59 + "${FILESDIR}/${P}-test.patch" +) |