From 2192e1edd72a92aa33aeb76b85d888ee7690bcab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 10 Dec 2023 17:15:08 +0100 Subject: [PATCH] dev-python/isort: Backport broken dependency fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/isort/files/isort-5.13.0-poetry.patch | 16 ++++++++++++++++ ...sort-5.13.0.ebuild => isort-5.13.0-r1.ebuild} | 6 ++++++ 2 files changed, 22 insertions(+) create mode 100644 dev-python/isort/files/isort-5.13.0-poetry.patch rename dev-python/isort/{isort-5.13.0.ebuild => isort-5.13.0-r1.ebuild} (89%) diff --git a/dev-python/isort/files/isort-5.13.0-poetry.patch b/dev-python/isort/files/isort-5.13.0-poetry.patch new file mode 100644 index 0000000000000..31baa2ec08f82 --- /dev/null +++ b/dev-python/isort/files/isort-5.13.0-poetry.patch @@ -0,0 +1,16 @@ +diff --git a/pyproject.toml b/pyproject.toml +index ae539490..11e229ad 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -41,11 +41,6 @@ include = [ + + [tool.poetry.dependencies] + python = ">=3.8.0" +-pipreqs = {version = "*", optional = true} +-requirementslib = {version = "*", optional = true} +-pip-api = {version = "*", optional = true} +-colorama = {version = ">=0.4.6", optional = true} +-setuptools = {version = "*", optional = true} + + [tool.poetry.extras] + colors = ["colorama"] diff --git a/dev-python/isort/isort-5.13.0.ebuild b/dev-python/isort/isort-5.13.0-r1.ebuild similarity index 89% rename from dev-python/isort/isort-5.13.0.ebuild rename to dev-python/isort/isort-5.13.0-r1.ebuild index 219f0a3f4657e..83f18a7f31771 100644 --- a/dev-python/isort/isort-5.13.0.ebuild +++ b/dev-python/isort/isort-5.13.0-r1.ebuild @@ -39,6 +39,12 @@ BDEPEND=" distutils_enable_tests pytest src_prepare() { + local PATCHES=( + # sigh, can't people just stop using poetry?! + # https://github.com/PyCQA/isort/commit/f7a6b0eea57e87155a367e2490b49b40f83c3944 + "${FILESDIR}/${P}-poetry.patch" + ) + # unbundle tomli sed -i -e 's:from ._vendored ::' isort/settings.py || die rm -r isort/_vendored || die