diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
| commit | a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7 (patch) | |
| tree | 0c52bbae1c242fbc296bd650fcd1167685f81492 /dev-python/pipenv/files | |
| parent | bfd9c39e4712ebdb442d4ca0673061faed1e70e1 (diff) | |
| download | baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.gz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.xz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.zip | |
Adding metadata
Diffstat (limited to 'dev-python/pipenv/files')
5 files changed, 0 insertions, 250 deletions
diff --git a/dev-python/pipenv/files/pipenv-2026.5.2-0001-Append-always-install-to-pip-extra-args.patch b/dev-python/pipenv/files/pipenv-2026.5.2-0001-Append-always-install-to-pip-extra-args.patch deleted file mode 100644 index 3c9ec5d15db6..000000000000 --- a/dev-python/pipenv/files/pipenv-2026.5.2-0001-Append-always-install-to-pip-extra-args.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2473b666137dd36321b017086084ae316d78dd2a Mon Sep 17 00:00:00 2001 -From: Oz Tiram <oz.tiram@gmail.com> -Date: Wed, 8 Apr 2026 16:22:10 +0200 -Subject: [PATCH 1/2] Append always install to pip extra args - ---- - pipenv/routines/install.py | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py -index 6d590346..301755fd 100644 ---- a/pipenv/routines/install.py -+++ b/pipenv/routines/install.py -@@ -699,6 +699,18 @@ def batch_install_iteration( - allow_global=False, - extra_pip_args=None, - ): -+ -+ # Gentoo patch: -+ # Install dependencies into the venv even if they exist -+ # in the system. -+ # This is needed because pipenv imports the system packages to run. -+ # It does not change your system's packages. -+ -+ if (extra_pip_args is not None) and ("-I" not in extra_pip_args): -+ extra_pip_args.append("-I") -+ -+ # End of Gentoo patch -+ - with temp_environ(): - if not allow_global: - os.environ["PIP_USER"] = "0" --- -2.52.0 - diff --git a/dev-python/pipenv/files/pipenv-2026.5.2-0002-Inject-system-packages.patch b/dev-python/pipenv/files/pipenv-2026.5.2-0002-Inject-system-packages.patch deleted file mode 100644 index b92766c998c3..000000000000 --- a/dev-python/pipenv/files/pipenv-2026.5.2-0002-Inject-system-packages.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2d73e02ec2587d35e142a5246be2afd823048380 Mon Sep 17 00:00:00 2001 -From: Oz Tiram <oz.tiram@gmail.com> -Date: Wed, 8 Apr 2026 16:24:08 +0200 -Subject: [PATCH 2/2] Inject system packages - ---- - pipenv/patched/pip/__main__.py | 9 +++++++++ - pipenv/resolver.py | 7 +++++++ - 2 files changed, 16 insertions(+) - -diff --git a/pipenv/patched/pip/__main__.py b/pipenv/patched/pip/__main__.py -index e76aed6e..c071b144 100644 ---- a/pipenv/patched/pip/__main__.py -+++ b/pipenv/patched/pip/__main__.py -@@ -21,6 +21,15 @@ if __package__ == "": - if __name__ == "__main__": - import importlib.util - import sys -+ -+ # GENTOO PATCH -+ SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))) -+ -+ # Inject site directory into system path. -+ sys.path.insert(-1, SITE_PACKAGES_ROOT) -+ -+ # END GENTOO PATCH -+ - spec = importlib.util.spec_from_file_location( - "pipenv", - location=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "__init__.py")) -diff --git a/pipenv/resolver.py b/pipenv/resolver.py -index 350717cd..5762648a 100644 ---- a/pipenv/resolver.py -+++ b/pipenv/resolver.py -@@ -7,6 +7,13 @@ from dataclasses import dataclass, field - from pathlib import Path - from typing import Any, Dict, List, Optional, Set - -+# GENTOO PATCH -+SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(__file__)) -+ -+# Inject site directory into system path. -+sys.path.insert(-1, SITE_PACKAGES_ROOT) -+ -+# END GENTOO PATCH - - def _ensure_modules(): - # Try to ensure typing_extensions is available in sys.modules --- -2.52.0 - diff --git a/dev-python/pipenv/files/pipenv-2026.6.1-0001-Append-always-install-to-pip-extra-args.patch b/dev-python/pipenv/files/pipenv-2026.6.1-0001-Append-always-install-to-pip-extra-args.patch deleted file mode 100644 index 3c9ec5d15db6..000000000000 --- a/dev-python/pipenv/files/pipenv-2026.6.1-0001-Append-always-install-to-pip-extra-args.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2473b666137dd36321b017086084ae316d78dd2a Mon Sep 17 00:00:00 2001 -From: Oz Tiram <oz.tiram@gmail.com> -Date: Wed, 8 Apr 2026 16:22:10 +0200 -Subject: [PATCH 1/2] Append always install to pip extra args - ---- - pipenv/routines/install.py | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py -index 6d590346..301755fd 100644 ---- a/pipenv/routines/install.py -+++ b/pipenv/routines/install.py -@@ -699,6 +699,18 @@ def batch_install_iteration( - allow_global=False, - extra_pip_args=None, - ): -+ -+ # Gentoo patch: -+ # Install dependencies into the venv even if they exist -+ # in the system. -+ # This is needed because pipenv imports the system packages to run. -+ # It does not change your system's packages. -+ -+ if (extra_pip_args is not None) and ("-I" not in extra_pip_args): -+ extra_pip_args.append("-I") -+ -+ # End of Gentoo patch -+ - with temp_environ(): - if not allow_global: - os.environ["PIP_USER"] = "0" --- -2.52.0 - diff --git a/dev-python/pipenv/files/pipenv-2026.6.1-0002-Inject-system-packages.patch b/dev-python/pipenv/files/pipenv-2026.6.1-0002-Inject-system-packages.patch deleted file mode 100644 index b92766c998c3..000000000000 --- a/dev-python/pipenv/files/pipenv-2026.6.1-0002-Inject-system-packages.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2d73e02ec2587d35e142a5246be2afd823048380 Mon Sep 17 00:00:00 2001 -From: Oz Tiram <oz.tiram@gmail.com> -Date: Wed, 8 Apr 2026 16:24:08 +0200 -Subject: [PATCH 2/2] Inject system packages - ---- - pipenv/patched/pip/__main__.py | 9 +++++++++ - pipenv/resolver.py | 7 +++++++ - 2 files changed, 16 insertions(+) - -diff --git a/pipenv/patched/pip/__main__.py b/pipenv/patched/pip/__main__.py -index e76aed6e..c071b144 100644 ---- a/pipenv/patched/pip/__main__.py -+++ b/pipenv/patched/pip/__main__.py -@@ -21,6 +21,15 @@ if __package__ == "": - if __name__ == "__main__": - import importlib.util - import sys -+ -+ # GENTOO PATCH -+ SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))) -+ -+ # Inject site directory into system path. -+ sys.path.insert(-1, SITE_PACKAGES_ROOT) -+ -+ # END GENTOO PATCH -+ - spec = importlib.util.spec_from_file_location( - "pipenv", - location=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "__init__.py")) -diff --git a/pipenv/resolver.py b/pipenv/resolver.py -index 350717cd..5762648a 100644 ---- a/pipenv/resolver.py -+++ b/pipenv/resolver.py -@@ -7,6 +7,13 @@ from dataclasses import dataclass, field - from pathlib import Path - from typing import Any, Dict, List, Optional, Set - -+# GENTOO PATCH -+SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(__file__)) -+ -+# Inject site directory into system path. -+sys.path.insert(-1, SITE_PACKAGES_ROOT) -+ -+# END GENTOO PATCH - - def _ensure_modules(): - # Try to ensure typing_extensions is available in sys.modules --- -2.52.0 - diff --git a/dev-python/pipenv/files/pipenv-2026.6.1-0003-fix-graph-inject-pipdeptree-parent-into-PYTHONPATH.patch b/dev-python/pipenv/files/pipenv-2026.6.1-0003-fix-graph-inject-pipdeptree-parent-into-PYTHONPATH.patch deleted file mode 100644 index 722d20991f57..000000000000 --- a/dev-python/pipenv/files/pipenv-2026.6.1-0003-fix-graph-inject-pipdeptree-parent-into-PYTHONPATH.patch +++ /dev/null @@ -1,78 +0,0 @@ -From e974b2ca4114acc5feb6c3274a44128e43cb3ef3 Mon Sep 17 00:00:00 2001 -From: Oz Tiram <oz.tiram@gmail.com> -Date: Wed, 29 Apr 2026 10:36:08 +0200 -Subject: [PATCH] fix(graph): inject pipdeptree parent into PYTHONPATH for - system installs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On Gentoo, vendored pip dependencies are de-bundled, so -`pipenv.vendor.pipdeptree` resolves to the system pipdeptree -(e.g. /usr/lib/python3.12/site-packages/pipdeptree/). - -When pipenv runs it via the virtualenv's Python, that interpreter -cannot find `pipdeptree` — causing a ModuleNotFoundError. - -Fix by injecting pipdeptree_path.parent into PYTHONPATH before -invoking the subprocess in both graph.py and update.py. The -l -(local-only) flag still filters enumerated packages to the -virtualenv via sys.prefix, so the graph output is unaffected. - -Signed-off-by: Oz Tiram <oz.tiram@gmail.com> ---- - pipenv/routines/graph.py | 13 ++++++++++++- - pipenv/routines/update.py | 8 +++++++- - 2 files changed, 19 insertions(+), 2 deletions(-) - -diff --git a/pipenv/routines/graph.py b/pipenv/routines/graph.py -index a1df5965..954ca326 100644 ---- a/pipenv/routines/graph.py -+++ b/pipenv/routines/graph.py -@@ -1,4 +1,5 @@ - import json as simplejson -+import os - import sys - from pathlib import Path - -@@ -51,7 +52,17 @@ def do_graph(project, bare=False, json=False, json_tree=False, reverse=False): - ) - sys.exit(1) - -- c = run_command(cmd_args, is_verbose=project.s.is_verbose()) -+ # Ensure pipdeptree's parent directory is on PYTHONPATH so the virtualenv -+ # Python can import pipdeptree. This is necessary when pipdeptree is a -+ # system package (e.g. Gentoo unbundles vendored deps) rather than the -+ # copy vendored inside pipenv. -+ env = os.environ.copy() -+ pythonpath_parts = [str(pipdeptree_path.parent)] -+ if existing := env.get("PYTHONPATH"): -+ pythonpath_parts.append(existing) -+ env["PYTHONPATH"] = os.pathsep.join(pythonpath_parts) -+ -+ c = run_command(cmd_args, is_verbose=project.s.is_verbose(), env=env) - - # Run dep-tree. - if not bare: -diff --git a/pipenv/routines/update.py b/pipenv/routines/update.py -index 2dc4a289..bc0f605d 100644 ---- a/pipenv/routines/update.py -+++ b/pipenv/routines/update.py -@@ -122,7 +122,13 @@ def get_reverse_dependencies(project) -> Dict[str, Set[Tuple[str, str]]]: - python_path = project.python() - cmd_args = [python_path, str(pipdeptree_path), "-l", "--reverse", "--json-tree"] - -- c = run_command(cmd_args, is_verbose=project.s.is_verbose()) -+ env = os.environ.copy() -+ pythonpath_parts = [str(pipdeptree_path.parent)] -+ if existing := env.get("PYTHONPATH"): -+ pythonpath_parts.append(existing) -+ env["PYTHONPATH"] = os.pathsep.join(pythonpath_parts) -+ -+ c = run_command(cmd_args, is_verbose=project.s.is_verbose(), env=env) - if c.returncode != 0: - raise PipenvCmdError(c.err, c.out, c.returncode) - try: --- -2.52.0 - |
