[gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/files/, dev-python/pipenv/

["Michał Górny" <mgorny@gentoo.org>]

commit:     6745a575d276f0cc18c27540776797efb1dfd4bc
Author:     Oz Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Mon Mar 11 19:24:43 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 15:33:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6745a575

dev-python/pipenv: drop 2023.7.11

Signed-off-by: Oz Tiram <oz.tiram <AT> gmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pipenv/Manifest                         |   1 -
 .../pipenv-2022.9.24-inject-site-packages.patch    |  34 -------
 .../pipenv-2023.4.29-append-always-install.patch   |  19 ----
 .../files/pipenv-2023.7.11-fix-imports-utils.patch |  15 ---
 .../files/pipenv-2023.7.11-fix-imports.patch       |  39 --------
 dev-python/pipenv/pipenv-2023.7.11.ebuild          | 108 ---------------------
 6 files changed, 216 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 98862f7c9984..875a700fe60b 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1 @@
 DIST pipenv-2023.11.15.gh.tar.gz 10837840 BLAKE2B 611bac2cda46236264026bb3aa4183e4458dfee07dc43640f902bb85840033beb32e4617584d8a243c640d84893368f91a1d91454cdfd477d6c075fc56a04dd2 SHA512 662190a43529724e24a2e1e4b967867c7fa4ddd99fd903d45659e2a685880b2a0086df69dfb3ed3c2973da8aec5604be6935d21d8ce5e224b5418a6adabc12b7
-DIST pipenv-2023.7.11.gh.tar.gz 10828051 BLAKE2B 3eeab9c5328dc5914e7e024f07bf105241ca777187ce50d5765f0ca1bb7270d8c6bda6a842b188fcacb57ba8bf5d0ed5f7b29b9edce5d45e485c8079691ac991 SHA512 d37cf030f4f77d4c95d0f0883140b1e829d4473b43fdc3f61c3d39827fdf9c98ecfc794d3eacf3ebedb55dadb018416c1250938a193a6382ac61ce859d19e193

diff --git a/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch b/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch
deleted file mode 100644
index 04cf0ed9e317..000000000000
--- a/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/pipenv/patched/pip/__main__.py b/pipenv/patched/pip/__main__.py
-index b424ab20..79d52838 100644
---- a/pipenv/patched/pip/__main__.py
-+++ b/pipenv/patched/pip/__main__.py
-@@ -28,6 +28,13 @@ 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)
-diff --git a/pipenv/resolver.py b/pipenv/resolver.py
-index 3fea0a1e..a0d9da29 100644
---- a/pipenv/resolver.py
-+++ b/pipenv/resolver.py
-@@ -6,6 +6,11 @@ import sys
- 
- os.environ["PIP_PYTHON_PATH"] = str(sys.executable)
- 
-+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(

diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch b/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
deleted file mode 100644
index 25a9c604e5b4..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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.
-+    # 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")
-+
-     is_artifact = False
-     for dep in deps_to_install:
-         if dep.req.req:

diff --git a/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports-utils.patch b/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports-utils.patch
deleted file mode 100644
index 2e348bf8e440..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports-utils.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/pipenv/utils/environment.py b/pipenv/utils/environment.py
-index 2e066eef2..219d8f9e5 100644
---- a/pipenv/utils/environment.py
-+++ b/pipenv/utils/environment.py
-@@ -1,7 +1,9 @@
- import os
- 
-+import click
-+import dotenv
-+
- 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.7.11-fix-imports.patch b/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports.patch
deleted file mode 100644
index a437d55b6964..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/pipenv/environment.py b/pipenv/environment.py
-index dbb89b011..89f2aaf9e 100644
---- a/pipenv/environment.py
-+++ b/pipenv/environment.py
-@@ -14,7 +14,9 @@ from sysconfig import get_paths, get_python_version, get_scheme_names
- from urllib.parse import urlparse
- from urllib.request import url2pathname
- 
-+import click
- import pipenv
-+
- from pipenv.patched.pip._internal.commands.install import InstallCommand
- from pipenv.patched.pip._internal.index.package_finder import PackageFinder
- from pipenv.patched.pip._vendor import pkg_resources
-@@ -23,7 +25,6 @@ from pipenv.utils.funktools import chunked, unnest
- from pipenv.utils.indexes import prepare_pip_source_args
- from pipenv.utils.processes import subprocess_run
- from pipenv.utils.shell import make_posix
--from pipenv.vendor import click
- from pipenv.vendor.pythonfinder.utils import is_in_path
- from pipenv.vendor.requirementslib.fileutils import normalize_path, temp_path
- from pipenv.vendor.requirementslib.utils import temp_environ
-diff --git a/pipenv/project.py b/pipenv/project.py
-index f865988b9..e8714ef63 100644
---- a/pipenv/project.py
-+++ b/pipenv/project.py
-@@ -44,9 +44,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, tomlkit
-+from pipenv.vendor import plette
- from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
- 
-+import click, tomlkit
-+
- try:
-     # this is only in Python3.8 and later
-     from functools import cached_property

diff --git a/dev-python/pipenv/pipenv-2023.7.11.ebuild b/dev-python/pipenv/pipenv-2023.7.11.ebuild
deleted file mode 100644
index 754900f42659..000000000000
--- a/dev-python/pipenv/pipenv-2023.7.11.ebuild
+++ /dev/null
@@ -1,108 +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.7.11-fix-imports.patch"
-	"${FILESDIR}/pipenv-2023.7.11-fix-imports-utils.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/
-}