gentoo auto-resync : 06:05:2023 - 05:33:06

3 files changed, 115 insertions, 6 deletions

diff --git a/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch b/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
index a5746fdb8ebe..25a9c604e5b4 100644
--- a/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
@@ -1,12 +1,14 @@
-diff --git a/pipenv/core.py b/pipenv/core.py
-index e42f184d1..02f8994de 100644
---- a/pipenv/core.py
-+++ b/pipenv/core.py
-@@ -791,6 +791,12 @@ def batch_install_iteration(
+diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py
+index 4b8b2bf8c..a3e1fbcf7 100644
+--- a/pipenv/routines/install.py
++++ b/pipenv/routines/install.py
+@@ -580,6 +580,14 @@ def batch_install_iteration(
          strip_extras_markers_from_requirement,
      )
  
-+    # Gentoo patch: install dependencies into the venv even if they exist in the system
++    # 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):
diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch
new file mode 100644
index 000000000000..eeae85039e12
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch
@@ -0,0 +1,31 @@
+diff --git a/pipenv/project.py b/pipenv/project.py
+index 75ee7d401..ed43cf2bc 100644
+--- a/pipenv/project.py
++++ b/pipenv/project.py
+@@ -40,9 +40,11 @@ from pipenv.utils.shell import (
+     system_which,
+ )
+ from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
+-from pipenv.vendor import click, plette, toml, tomlkit
++from pipenv.vendor import plette
+ from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
+ 
++import click, toml, tomlkit
++
+ try:
+     # this is only in Python3.8 and later
+     from functools import cached_property
+diff --git a/pipenv/utils/environment.py b/pipenv/utils/environment.py
+index 2e066eef2..9385689bf 100644
+--- a/pipenv/utils/environment.py
++++ b/pipenv/utils/environment.py
+@@ -1,7 +1,8 @@
+ import os
++import dotenv
++import click
+ 
+ from pipenv import environments
+-from pipenv.vendor import click, dotenv
+ 
+ 
+ def load_dot_env(project, as_dict=False, quiet=False):
diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
new file mode 100644
index 000000000000..cb0f3f70d48b
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
@@ -0,0 +1,76 @@
+diff --git a/pipenv/project.py b/pipenv/project.py
+index ed43cf2bc..903667639 100644
+--- a/pipenv/project.py
++++ b/pipenv/project.py
+@@ -13,6 +13,13 @@ import urllib.parse
+ from json.decoder import JSONDecodeError
+ from pathlib import Path
+ 
++import click, tomlkit
++
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
+ from pipenv.cmdparse import Script
+ from pipenv.environment import Environment
+ from pipenv.environments import Setting, is_in_virtualenv, normalize_pipfile_path
+diff --git a/pipenv/utils/toml.py b/pipenv/utils/toml.py
+index d4157d01c..27d9975ae 100644
+--- a/pipenv/utils/toml.py
++++ b/pipenv/utils/toml.py
+@@ -1,4 +1,9 @@
+-from pipenv.vendor import toml, tomlkit
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
++import tomlkit
+ 
+ 
+ def cleanup_toml(tml):
+diff --git a/pipenv/vendor/dparse/parser.py b/pipenv/vendor/dparse/parser.py
+index faaad2e8e..4c59474e9 100644
+--- a/pipenv/vendor/dparse/parser.py
++++ b/pipenv/vendor/dparse/parser.py
+@@ -10,6 +10,11 @@ from io import StringIO
+ from configparser import ConfigParser, NoOptionError
+ from pathlib import PurePath
+ 
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
+ from .errors import MalformedDependencyFileError
+ from .regex import HASH_REGEX
+ 
+@@ -17,7 +22,6 @@ from .dependencies import DependencyFile, Dependency
+ from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement,\
+     InvalidRequirement
+ from . import filetypes
+-import pipenv.vendor.toml as toml
+ from pipenv.patched.pip._vendor.packaging.specifiers import SpecifierSet
+ from pipenv.patched.pip._vendor.packaging.version import Version, InvalidVersion
+ import json
+diff --git a/pipenv/vendor/dparse/updater.py b/pipenv/vendor/dparse/updater.py
+index 7b7ba9a53..fe20a213f 100644
+--- a/pipenv/vendor/dparse/updater.py
++++ b/pipenv/vendor/dparse/updater.py
+@@ -3,9 +3,13 @@ from __future__ import absolute_import, print_function, unicode_literals
+ import re
+ import json
+ import tempfile
+-import pipenv.vendor.toml as toml
+ import os
+ 
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
+ 
+ class RequirementsTXTUpdater(object):
+     SUB_REGEX = r"^{}(?=\s*\r?\n?$)"