From e2dc1c2e2e3eac37235aa38630b4500d8f56d28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Tue, 25 Mar 2025 06:11:54 +0100
Subject: [PATCH] dev-python/pipdeptree: Remove old
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-python/pipdeptree/Manifest                |  1 -
 .../pipdeptree/pipdeptree-2.18.1-r1.ebuild    | 59 -------------------
 .../pipdeptree/pipdeptree-2.26.0.ebuild       |  4 +-
 3 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 dev-python/pipdeptree/pipdeptree-2.18.1-r1.ebuild

diff --git a/dev-python/pipdeptree/Manifest b/dev-python/pipdeptree/Manifest
index 6f78cde0a07dd..32c97733f4509 100644
--- a/dev-python/pipdeptree/Manifest
+++ b/dev-python/pipdeptree/Manifest
@@ -1,4 +1,3 @@
-DIST pipdeptree-2.18.1.tar.gz 35101 BLAKE2B e0a9bf6d85d0ab91049b557cd0c8a0a58e93e2342eb0a495ba5978ca734ec329ff363499ecf3182bdab8f01f0fe23653c0b683ec7a288b88b28d2120f0ad8a36 SHA512 ef0b3abb0fa591c92d7dca90ac449651a562adc4a87614dc6a18212274d10ca21fd09fd7e8989454eef2e265d7a1d89801b4a864892359c39bd9eca40885c2d2
 DIST pipdeptree-2.23.4.tar.gz 39945 BLAKE2B 6f1aaf4652b872a28712cf23fb06c26c9e36baf2c5c734b542d418d78081c19f567c730944fba33b43cf6ad612ecd54f37f625a81e88fc8bb68e3e56d76d9088 SHA512 3beeeceb11f842e5f337167b724354b43b01f972f83b0bac5168504483a079e15758206a8e141dc88e4810954630bff1b1cdec3e69aa2f981b9ec2896e40428d
 DIST pipdeptree-2.24.0.tar.gz 40363 BLAKE2B e0053b742c7e5cf88ce163b5ff504bda5c601e846f84769b742f5a06a298f041dacd223398f29608a91cdd0e91e523fa101d1781472e4327daf954af146e10ac SHA512 56c68f98ff401f4e1fbe7185a989f544c24740b4278fd3de9371019d4a85198a3cedfb2bc54d82fa958068e2133f8fbb326d280cd3e980537456da853c4777bc
 DIST pipdeptree-2.25.0.tar.gz 40425 BLAKE2B 66ea593cfcfb026876af0a336003f551bdb0b286af8721c8a093a0939c95e26b16511aac3ecd1c3372f13f0e470a3d4bcf0691969a8d65904f35e15e5e5407a1 SHA512 87e51f48cd114b1511f32a241137fe648f80e3be1d071020dcae7f3b62245b64c823c0824e474bb320b6e69dddad68a02d8938a116b4164d1f9fdbbd84aa5f25
diff --git a/dev-python/pipdeptree/pipdeptree-2.18.1-r1.ebuild b/dev-python/pipdeptree/pipdeptree-2.18.1-r1.ebuild
deleted file mode 100644
index b99c9659bda43..0000000000000
--- a/dev-python/pipdeptree/pipdeptree-2.18.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi optfeature
-
-DESCRIPTION="Utility for displaying installed packages in a dependency tree"
-HOMEPAGE="
-	https://github.com/tox-dev/pipdeptree/
-	https://pypi.org/project/pipdeptree/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/graphviz[${PYTHON_USEDEP}]
-		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# https://github.com/tox-dev/pipdeptree/pull/302
-	"${FILESDIR}/pipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch"
-	"${FILESDIR}/pipdeptree-2.18.1-fix-pypy-7.3.14.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	find -name '*.py' -exec \
-		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock -p console-scripts
-}
-
-pkg_postinst() {
-	optfeature \
-		"visualising the dependency graph with --graph-output" \
-		dev-python/graphviz
-}
diff --git a/dev-python/pipdeptree/pipdeptree-2.26.0.ebuild b/dev-python/pipdeptree/pipdeptree-2.26.0.ebuild
index 3137e87ae2869..317b616d12ca7 100644
--- a/dev-python/pipdeptree/pipdeptree-2.26.0.ebuild
+++ b/dev-python/pipdeptree/pipdeptree-2.26.0.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
 		dev-python/graphviz[${PYTHON_USEDEP}]
 		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		<dev-python/virtualenv-21[${PYTHON_USEDEP}]
 	)
 "
@@ -46,7 +47,8 @@ src_prepare() {
 
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock -p console-scripts
+	# tests can fail if other packages are being merged simultaneously
+	epytest -p pytest_mock -p console-scripts -p rerunfailures --reruns=5
 }
 
 pkg_postinst() {