From 0fcaac21e786bd7911b1e8f436cd885c5e2f6437 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Oct 2023 08:42:41 +0100 Subject: gentoo auto-resync : 27:10:2023 - 08:42:41 --- dev-python/pipenv/Manifest | 9 +- .../files/pipenv-2023.4.29-fix-imports.patch | 31 ------ .../files/pipenv-2023.4.29-fix-toml-dump.patch | 18 --- .../pipenv-2023.4.29-fix-toml-in-vendor.patch | 85 -------------- ...8-append-always-install-to-pip-extra-args.patch | 34 ++++++ .../pipenv-2023.9.8-inject-system-packages.patch | 53 +++++++++ dev-python/pipenv/pipenv-2023.4.29-r1.ebuild | 109 ------------------ dev-python/pipenv/pipenv-2023.9.8.ebuild | 124 +++++++++++++++++++++ 8 files changed, 215 insertions(+), 248 deletions(-) delete mode 100644 dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch delete mode 100644 dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch delete mode 100644 dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch create mode 100644 dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch create mode 100644 dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch delete mode 100644 dev-python/pipenv/pipenv-2023.4.29-r1.ebuild create mode 100644 dev-python/pipenv/pipenv-2023.9.8.ebuild (limited to 'dev-python/pipenv') diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest index ed8e91205280..3870638764fc 100644 --- a/dev-python/pipenv/Manifest +++ b/dev-python/pipenv/Manifest @@ -1,13 +1,12 @@ AUX pipenv-2022.9.24-inject-site-packages.patch 1155 BLAKE2B 61f296dd1f8168b86f17a55359c75febfc02807dd97c750217b46bd017b7bf73cf6fde0fcd2afa95908bd3e1cd7b50f626459f1a19f47b1c34ecdbea39fcfb7c SHA512 3a26ce6217fbf86eda1bb8266928dffe5fc1a55e4f7b66d0ade5ea31deff9cb68427f424995e4c8d402737e90ca9358a3a00364a4167667fae9a4bd018100ebc AUX pipenv-2023.4.29-append-always-install.patch 696 BLAKE2B 61ae23b3c948358109a80b406eb83a835293b6a986a191dbb759c9ffcb7e1a22b0766d4eb1271e5d2dd849ee97747f998417c79024ef5b212e3c21ebcebc2412 SHA512 635a1cccf28b7869b06538eb668d8abc385465fa28bc708376fd7ba1dda621d12529c0843a6d545577456f46d7ec7ae5794df34b0d5b73a897b67c3fc71145a2 -AUX pipenv-2023.4.29-fix-imports.patch 946 BLAKE2B 76cc36b1a60cb600851198340f1b42bed7210f62d9aec536a8bd203e86a62a11659cccf5c328e2ebbc11c0b22f863a8c70f64932170ca2d1ac0bfee526797f0b SHA512 ff6221fe4a1876a0f4c0677243d06c9e79cd08b504b20b958ce98194f0d269bdf2bedd3558af69d03d0dd24749c73999172c83c89643d362c6e095e54f55d73d -AUX pipenv-2023.4.29-fix-toml-dump.patch 732 BLAKE2B 5e1a379ee851763344c642da4c3a9876e0cda4e4f1697becfec63564c404d1070c886df5b9df7e379447bb191e7ecae63fd743bde4a8de8a1ca655ac78a3a23f SHA512 8152e1650d0f2c75c810c0ab64bff9544cfabcd3ff9b342aeddbeeda27549f8a4ee4eacdb71e7ec18945a91443381b5cecc1c5ad8a885a1f162811cd8f09f396 -AUX pipenv-2023.4.29-fix-toml-in-vendor.patch 2612 BLAKE2B 8951dc3baefe0d58262d5d8c2f1952331322665f4961ced0dab5ac4109a33a4cd107646d5a9281a6b3685d6885f3f6b256fd675f9308b8c7844b065bcbde3522 SHA512 075fe3a8b69265ea41071407edec1edba945ef38123da970a6ba4553f5bd7491f8b13b07241f6ecd3e77dff1b6542f279943b0a760711c8cb0827837a7daa376 AUX pipenv-2023.7.11-fix-imports-utils.patch 367 BLAKE2B 65529d5b515b265fa44be5e520051f98f5507989f1e708d7bf258bbd55304016cc6369ec6ec389268f7018165ddc2052aa2c6f6c4b89fff48d4b973e366b2092 SHA512 15c91f4f663254e314a8d74ffea68b63a96a40a0732be18692629c338551114924f876db7085b965d274c5124d001e735871bf06a1abe2e5df80de7eb354158a AUX pipenv-2023.7.11-fix-imports.patch 1572 BLAKE2B e2dca1f8cb57138a9d19baf4b0b036f88172f1e58ad1d41201f6020088357fd0ace950d9b49c95a34caa391826da13468d5bca472b50717b5ee32e9474de22a6 SHA512 592d271ce3bc3e375090a39e9629f8a6eba80f9a2b15562e3902b94cc42ac24b6cb097f5c62c307a1dcee3a179d0a0c8475375b94512eaeadc05d369d60b1087 -DIST pipenv-2023.4.29.gh.tar.gz 10808706 BLAKE2B 31432b80f82b041969e75d0ec0a28ca90068395be25dac94a7f34526f0b638adfae59e9396b147fa61592ee78af2d9cfb4a1b65dedea9bbb299b2624a6d6e9a1 SHA512 870b33ced4ed909b23b9d345ec788f4b5fffde4b253755e8a41b0629e885ef49ca14e9a68b5919b70074829002603fe427e8b77f41028a7de33d269a910354ff +AUX pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch 1043 BLAKE2B 09a50ba813d21a82333905e098dbd99b11a6c6f07c2ae512eed4189bfee371b0ceb2e27ffff41fb414b336c8ec49014c43903f3a2f12fb9b6323dafdf13f8634 SHA512 c900dc2589b5f4b3f36b15ddf2287d74dcafb1395c96330058a400ac3698a525715b69cd32b5780cc7ec9d71d067f159c623deaf63c9e4c11876cd651c069f87 +AUX pipenv-2023.9.8-inject-system-packages.patch 1672 BLAKE2B d803b80a5c46bac67ab7c361f369fad58b1c2a933bc2f78b2d4fa5fa172a23e7e5c026edf48cf398b3232280428eaf40369cafdf4c6c019c3dc9e397e884564d SHA512 5600a8bd7bc5cdf2152d84fc7791359a04df15f38d11f8c9517b709a2793ce05c6fc5acc1d1d8b763078465012e421826699287d2e3ae97838e155a9a1694650 DIST pipenv-2023.7.11.gh.tar.gz 10828051 BLAKE2B 3eeab9c5328dc5914e7e024f07bf105241ca777187ce50d5765f0ca1bb7270d8c6bda6a842b188fcacb57ba8bf5d0ed5f7b29b9edce5d45e485c8079691ac991 SHA512 d37cf030f4f77d4c95d0f0883140b1e829d4473b43fdc3f61c3d39827fdf9c98ecfc794d3eacf3ebedb55dadb018416c1250938a193a6382ac61ce859d19e193 -EBUILD pipenv-2023.4.29-r1.ebuild 4161 BLAKE2B a9b5486d69f30af06517b100771280a9562399257fd599c63787cdd235d9c4e2a1d8c113592d3e61fa972487e3896982b7fe6478c456649e3f48b125437bca92 SHA512 4687a9d3ad00d71db2259615ad4f37b3503b92a742094fdc663ff9b217e3bbf7e5faf05ffe9021a189f7a80b0924a6ebd2b7dcdd3daa633d6c77a2c463e8e3b7 +DIST pipenv-2023.9.8.gh.tar.gz 10819425 BLAKE2B 3fd67d5aa7022251660c09d47e6d2487eabca507dbac8ebb2c298ef46cae452e6f2330615053d80a404f98ce523e5ff15ef89adbc85779305633b45e6b989423 SHA512 328cab44cea16bb685f745f80804e2a8b951e93a24379d5b61faeae4730e58d48cff663652f785800dd1dffc7a05f398ca54eb5118cd4fcfa43c35dad86f60eb EBUILD pipenv-2023.7.11-r1.ebuild 4234 BLAKE2B 56fbb2c0683958ce132ba4cddc0933fa358cd1ec8829e23f61c52535a932ab2ca68dd12940a70fe5125bc521818928e50e74e8db00e98a64a41a558082c48122 SHA512 9e4f240a47f62adb91301c0d3a068dffb166191c8231d7801a9e45693b0f0cb7c7e12ec43fcf17b2f1681b7bf38938d8ca38ec2e38cb51b61bbfef60653095c5 EBUILD pipenv-2023.7.11.ebuild 4108 BLAKE2B 89b3556b5f91c0170ff80fcb8de66b13afee7aa8e433309f10012d0f33636cff63538e0c742f15f5e01fe51dcf3b944ba0cccfab1c7d65cd22ac342ed857d490 SHA512 37dc19e6457b1a9f0cc4c0e3b39ac1534981e5459e8347276f6ba1118908405a9e6a3f790c7b4cc1167cfc561e66931e6f2991fe8ac706361bb82a7846590ebd +EBUILD pipenv-2023.9.8.ebuild 4856 BLAKE2B 64b51e4a690bfcb24563e27e3d68b57f2250d2572e334729b323413fcd192ad12f36598bb32e97741301d430601e37a70715554e501c5185cafe22d63e2479bf SHA512 b660783249a1b6c6ea8a97f76362a8638bd7ab05109d03a24082a42f22750f4bed22b247584f224c541821719fe883daf6fa95b336e7de347236aff148429d35 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282 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 deleted file mode 100644 index eeae85039e12..000000000000 --- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch +++ /dev/null @@ -1,31 +0,0 @@ -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-dump.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch deleted file mode 100644 index 8218d0f59e1c..000000000000 --- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/pipenv/project.py b/pipenv/project.py -index 55251bc5f..9fd46f089 100644 ---- a/pipenv/project.py -+++ b/pipenv/project.py -@@ -183,9 +183,9 @@ class Project: - "name": "pypi", - } - -- default_sources_toml = f"[[source]]\n{toml.dumps(self.default_source)}" -+ default_sources_toml = f"[[source]]\n{tomlkit.dumps(self.default_source)}" - for pip_conf_index in pip_conf_indexes: -- default_sources_toml += f"\n\n[[source]]\n{toml.dumps(pip_conf_index)}" -+ default_sources_toml += f"\n\n[[source]]\n{tomlkit.dumps(pip_conf_index)}" - plette.pipfiles.DEFAULT_SOURCE_TOML = default_sources_toml - - # Hack to skip this during pipenv run, or -r. - - 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 deleted file mode 100644 index e23a42e46b59..000000000000 --- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/pipenv/project.py b/pipenv/project.py -index ed43cf2bc..55251bc5f 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 -@@ -43,8 +50,6 @@ from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables - 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/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?$)" diff --git a/dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch b/dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch new file mode 100644 index 000000000000..d97987fd0db3 --- /dev/null +++ b/dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch @@ -0,0 +1,34 @@ +From 8ee76835b2d615156bb6d329417d6ce8d19bfa3a Mon Sep 17 00:00:00 2001 +From: Oz Tiram +Date: Wed, 20 Sep 2023 23:11:27 +0200 +Subject: [PATCH 2/4] Append always install to pip extra args + +--- + pipenv/routines/install.py | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py +index 2f135b435..e30f2da52 100644 +--- a/pipenv/routines/install.py ++++ b/pipenv/routines/install.py +@@ -459,6 +459,17 @@ 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.41.0 + diff --git a/dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch b/dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch new file mode 100644 index 000000000000..cf211f1ab846 --- /dev/null +++ b/dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch @@ -0,0 +1,53 @@ +From b6b25911c050f0bec192e5ccb09ddc6dc3d5fa7d Mon Sep 17 00:00:00 2001 +From: Oz Tiram +Date: Wed, 20 Sep 2023 23:03:57 +0200 +Subject: [PATCH 1/4] Inject system packages + +--- + pipenv/patched/pip/__main__.py | 8 ++++++++ + pipenv/resolver.py | 6 ++++++ + 2 files changed, 14 insertions(+) + +diff --git a/pipenv/patched/pip/__main__.py b/pipenv/patched/pip/__main__.py +index 032297163..59f7ad19e 100644 +--- a/pipenv/patched/pip/__main__.py ++++ b/pipenv/patched/pip/__main__.py +@@ -21,10 +21,18 @@ if __package__ == "": + if __name__ == "__main__": + import importlib.util + import sys ++ ++ 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) ++ + spec = importlib.util.spec_from_file_location( + "pipenv", location=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "__init__.py")) + pipenv = importlib.util.module_from_spec(spec) + sys.modules["pipenv"] = pipenv ++ ++ + spec.loader.exec_module(pipenv) + from pipenv.patched.pip._internal.cli.main import main as _main + +diff --git a/pipenv/resolver.py b/pipenv/resolver.py +index 82e01ca39..29461b878 100644 +--- a/pipenv/resolver.py ++++ b/pipenv/resolver.py +@@ -10,6 +10,12 @@ except ImportError: + cached_property = property + + ++SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(__file__)) ++ ++# Inject site directory into system path. ++sys.path.insert(-1, SITE_PACKAGES_ROOT) ++ ++ + def _ensure_modules(): + spec = importlib.util.spec_from_file_location( + "typing_extensions", +-- +2.41.0 + diff --git a/dev-python/pipenv/pipenv-2023.4.29-r1.ebuild b/dev-python/pipenv/pipenv-2023.4.29-r1.ebuild deleted file mode 100644 index 123b4de71625..000000000000 --- a/dev-python/pipenv/pipenv-2023.4.29-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) - -inherit distutils-r1 multiprocessing - -MY_PV=${PV/_beta/b} -DESCRIPTION="Python Development Workflow for Humans" -HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/" -SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}"/${PN}-${MY_PV} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" - -PATCHES=( - "${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch" - "${FILESDIR}/pipenv-2023.4.29-append-always-install.patch" - "${FILESDIR}/pipenv-2023.4.29-fix-imports.patch" - "${FILESDIR}/pipenv-2023.4.29-fix-toml-in-vendor.patch" - "${FILESDIR}/pipenv-2023.4.29-fix-toml-dump.patch" -) - -RDEPEND=" - dev-python/attrs[${PYTHON_USEDEP}] - >=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}] - dev-python/click[${PYTHON_USEDEP}] - >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}] - >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}] - >=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}] - >=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10}) - >=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}] - >=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}] - dev-python/virtualenv-clone[${PYTHON_USEDEP}] - >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] - dev-python/ruamel-yaml[${PYTHON_USEDEP}] - dev-python/tomlkit[${PYTHON_USEDEP}] -" - -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -# IMPORTANT: The following sed command patches the vendor direcotry -# in the pipenv source. Attempts to simply bump the version of the -# package without checking that it works is likely to fail -# The vendored packages should eventually all be removed -# see: https://bugs.gentoo.org/717666 -src_prepare() { - local pkgName - local jobs=$(makeopts_jobs) - local packages=( attr attrs cerberus colorama dotenv markupsafe \ - pexpect ptyprocess pyparsing requests urllib3 tomlkit ) - for pkgName in ${packages[@]}; do - find ./ -type f -print0 | \ - xargs --max-procs="${jobs}" --null \ - sed --in-place \ - -e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \ - -e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\ - -e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \ - -e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}" - done - - distutils-r1_src_prepare - - # remove vendored versions - for pkgName in ${packages[@]}; do - find ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die - # package names can be foo-bar, their module will be however foo_bar - find ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die - done - - find ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die - - find ./ -type f -print0 | \ - xargs --max-procs="${jobs}" --null \ - sed --in-place \ - -e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g" - - # remove python ruaml yaml - sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml" - sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml" - - rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor" - - for fname in Makefile README.md README.rst ruamel.*.LICENSE vendor.txt; do - rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/$fname" - done - -} - -python_test() { - epytest -m "not cli and not needs_internet" tests/unit/ -} diff --git a/dev-python/pipenv/pipenv-2023.9.8.ebuild b/dev-python/pipenv/pipenv-2023.9.8.ebuild new file mode 100644 index 000000000000..c51698623502 --- /dev/null +++ b/dev-python/pipenv/pipenv-2023.9.8.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 multiprocessing + +MY_PV=${PV/_beta/b} +DESCRIPTION="Python Development Workflow for Humans" +HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/" +SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}"/${PN}-${MY_PV} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +PATCHES=( + "${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch" + "${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch" +) + +RDEPEND=" + >=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}] + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-didyoumean[${PYTHON_USEDEP}] + >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}] + dev-python/dparse[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}] + >=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}] + dev-python/pipdeptree[${PYTHON_USEDEP}] + dev-python/plette[${PYTHON_USEDEP}] + >=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}] + =dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}] + >=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}] + dev-python/virtualenv-clone[${PYTHON_USEDEP}] + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + dev-python/shellingham[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/tomlkit[${PYTHON_USEDEP}] +" + +BDEPEND=" + ${RDEPEND} + test? ( + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +# IMPORTANT: The following sed command patches the vendor direcotry +# in the pipenv source. Attempts to simply bump the version of the +# package without checking that it works is likely to fail +# The vendored packages should eventually all be removed +# see: https://bugs.gentoo.org/717666 +src_prepare() { + sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py" + + local pkgName + local jobs=$(makeopts_jobs) + local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \ + pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \ + requests urllib3 shellingham tomli tomlkit ) + for pkgName in ${packages[@]}; do + find ./ -type f -print0 | \ + xargs --max-procs="${jobs}" --null \ + sed --in-place \ + -e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \ + -e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\ + -e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \ + -e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}" + done + + distutils-r1_src_prepare + + # remove vendored versions + for pkgName in ${packages[@]}; do + find ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die + # package names can be foo-bar, their module will be however foo_bar + find ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die + done + + find ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die + + find ./ -type f -print0 | \ + xargs --max-procs="${jobs}" --null \ + sed --in-place \ + -e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g" + + # remove python ruaml yaml + sed --in-place -e \ + "s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \ + pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml" + sed --in-place -e \ + "s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \ + pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml" + + rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor" + + for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do + rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}" + done + + sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests" + + rm -Rfv pipenv/vendor || die "Could not vendor" + rm -Rfv examples || die "Could not remove examples" +} + +python_test() { + epytest -m "not cli and not needs_internet" tests/unit/ +} -- cgit v1.2.3