summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2024-08-28 09:18:59 +0200
committerJoonas Niilola <juippis@gentoo.org>2024-08-28 10:25:48 +0300
commitfa85d8cc2ddfed756d6edb48a6b14801ba1a4c88 (patch)
tree165de6dd224206289e5676f558ef3044656a967e /dev-python/pipdeptree
parentnet-nds/openldap: remove unused patch (diff)
downloadgentoo-fa85d8cc2ddfed756d6edb48a6b14801ba1a4c88.tar.gz
gentoo-fa85d8cc2ddfed756d6edb48a6b14801ba1a4c88.tar.bz2
gentoo-fa85d8cc2ddfed756d6edb48a6b14801ba1a4c88.zip
dev-python/pipdeptree: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/38312 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-python/pipdeptree')
-rw-r--r--dev-python/pipdeptree/files/pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch26
-rw-r--r--dev-python/pipdeptree/files/pipdeptree-2.13.2-fix-pypy-7.3.14.patch37
2 files changed, 0 insertions, 63 deletions
diff --git a/dev-python/pipdeptree/files/pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch b/dev-python/pipdeptree/files/pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch
deleted file mode 100644
index 5cc4b1ca580d..000000000000
--- a/dev-python/pipdeptree/files/pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/tox-dev/pipdeptree/pull/302
-
-From 8a2ccfe062d8978f010e2e4bd3f8e8b9e46ecbce Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Tue, 14 Nov 2023 08:36:09 +0200
-Subject: [PATCH] Expect hpy in pypy versions >= 7.3.3
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/tests/test_non_host.py
-+++ b/tests/test_non_host.py
-@@ -33,7 +33,11 @@ def test_custom_interpreter(
- if implementation == "CPython":
- expected = {"pip", "setuptools", "wheel"}
- elif implementation == "PyPy":
-- expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}
-+ # hpy added in 7.3.2, enabled in 7.3.3
-+ if sys.pypy_version_info >= (7, 3, 3):
-+ 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.42.1
-
diff --git a/dev-python/pipdeptree/files/pipdeptree-2.13.2-fix-pypy-7.3.14.patch b/dev-python/pipdeptree/files/pipdeptree-2.13.2-fix-pypy-7.3.14.patch
deleted file mode 100644
index 3718174d0af6..000000000000
--- a/dev-python/pipdeptree/files/pipdeptree-2.13.2-fix-pypy-7.3.14.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/923893
-
-From 5d111ebe3bb1d24baa314b615d67d3e3928297ca Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Wed, 7 Feb 2024 08:47:03 +0200
-Subject: [PATCH] Use json output for test which parses installed packages
-
-* pypy bundles hpy which has a dependency on setuptools, therefore
- breaking non-json output due sub-dependency pretty printing.
-* Using json makes parsing dependencies straight forward.
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- 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
-@@ -25,10 +26,10 @@ def test_custom_interpreter(
- monkeypatch.chdir(tmp_path)
- py = str(result.creator.exe.relative_to(tmp_path))
- cmd += [f"--python={result.creator.exe}"] if args_joined else ["--python", py]
-- monkeypatch.setattr(sys, "argv", cmd)
-+ monkeypatch.setattr(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"}
---
-2.43.0
-