commit: a72e65037a9e658c7ab7ec58a1cb3bc794826059 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Mar 30 08:23:16 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Mar 30 11:15:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a72e6503
dev-python/pipdeptree: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> ...ipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch | 28 ---------------------- .../files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch | 24 ------------------- 2 files changed, 52 deletions(-) diff --git a/dev-python/pipdeptree/files/pipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch b/dev-python/pipdeptree/files/pipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch deleted file mode 100644 index 09c31f8a78b4..000000000000 --- a/dev-python/pipdeptree/files/pipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/tox-dev/pipdeptree/pull/302 - -From 1fc794e66fc5cac464704dda1bc303353386584f Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <[email protected]> -Date: Tue, 14 Nov 2023 08:36:09 +0200 -Subject: [PATCH] Expect hpy in pypy versions >= 7.3.3 - -Signed-off-by: Alfred Wingate <[email protected]> ---- a/tests/test_non_host.py -+++ b/tests/test_non_host.py -@@ -32,8 +32,12 @@ def test_custom_interpreter( - implementation = python_implementation() - if implementation == "CPython": - expected = {"pip", "setuptools", "wheel"} -- elif implementation == "PyPy": -- expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"} # pragma: no cover -+ elif implementation == "PyPy": # pragma: no cover -+ # hpy added in 7.3.2, enabled in 7.3.3 -+ if sys.pypy_version_info >= (7, 3, 3): # type: ignore[attr-defined] -+ expected = {"cffi", "greenlet", "hpy", "pip", "readline", "setuptools", "wheel"} -+ else: -+ expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"} - else: - raise ValueError(implementation) - if sys.version_info >= (3, 12): --- -2.44.0 - diff --git a/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch b/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch deleted file mode 100644 index 32d039fed519..000000000000 --- a/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/tests/test_non_host.py b/tests/test_non_host.py -index 2849375..ed7b7b3 100644 ---- a/tests/test_non_host.py -+++ b/tests/test_non_host.py -@@ -1,5 +1,6 @@ - from __future__ import annotations - -+import json - import sys - from platform import python_implementation - from typing import TYPE_CHECKING -@@ -31,10 +32,10 @@ def test_custom_interpreter( - result = virtualenv.cli_run([str(tmp_path / "venv"), "--activators", ""]) - py = str(result.creator.exe.relative_to(tmp_path)) - cmd = ["", f"--python={result.creator.exe}"] if args_joined else ["", "--python", py] -- mocker.patch("pipdeptree._discovery.sys.argv", cmd) -+ mocker.patch("pipdeptree._discovery.sys.argv", [*cmd, "-j"]) - main() - out, _ = capfd.readouterr() -- found = {i.split("==")[0] for i in out.splitlines()} -+ found = {i["package"]["package_name"] for i in json.loads(out)} - implementation = python_implementation() - if implementation == "CPython": - expected = {"pip", "setuptools", "wheel"}
