commit: 8e0be56464cc537990c3ae58a9f89cca081af059 Author: Oz N Tiram <oz.tiram <AT> gmail <DOT> com> AuthorDate: Fri Jul 23 22:01:14 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Aug 3 07:09:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0be564
dev-python/pipenv: remove vendored jinja2 and attr. Since pipenv bundles tons of packages, these will be removed in a slow pace. If no bugs are reported, the removal of bundled packages and addition of dependencies can continue. Bug: https://bugs.gentoo.org/717666 Signed-off-by: Oz N Tiram <oz.tiram <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21828 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ...nv-2021-5-29-r1-remove-attr-vendor-import.patch | 95 ++++++++++++++++++++++ dev-python/pipenv/pipenv-2021.5.29-r1.ebuild | 54 ++++++++++++ 2 files changed, 149 insertions(+) diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch new file mode 100644 index 00000000000..3437c2a2f33 --- /dev/null +++ b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch @@ -0,0 +1,95 @@ +diff --git a/pipenv/installers.py b/pipenv/installers.py +index 1e81047d..ccfd639c 100644 +--- a/pipenv/installers.py ++++ b/pipenv/installers.py +@@ -6,8 +6,11 @@ from abc import ABCMeta, abstractmethod + + + from .environments import PIPENV_INSTALL_TIMEOUT +-from .vendor import attr, delegator + from .utils import find_windows_executable ++# future version of pipenv drops this ++# hence, this stays here for a while ++from .vendor import delegator ++import attr + + + @attr.s +diff --git a/pipenv/vendor/passa/models/projects.py b/pipenv/vendor/passa/models/projects.py +index c7807c05..f6e037d6 100644 +--- a/pipenv/vendor/passa/models/projects.py ++++ b/pipenv/vendor/passa/models/projects.py +@@ -6,7 +6,7 @@ import collections + import io + import os + +-from pipenv.vendor import attr ++import attr + import packaging.markers + import packaging.utils + import plette +diff --git a/pipenv/vendor/pythonfinder/models/mixins.py b/pipenv/vendor/pythonfinder/models/mixins.py +index aeba0443..76327115 100644 +--- a/pipenv/vendor/pythonfinder/models/mixins.py ++++ b/pipenv/vendor/pythonfinder/models/mixins.py +@@ -5,7 +5,7 @@ import abc + import operator + from collections import defaultdict + +-from pipenv.vendor import attr ++import attr + import six + + from ..compat import fs_str +diff --git a/pipenv/vendor/pythonfinder/models/path.py b/pipenv/vendor/pythonfinder/models/path.py +index e8c13429..7a197181 100644 +--- a/pipenv/vendor/pythonfinder/models/path.py ++++ b/pipenv/vendor/pythonfinder/models/path.py +@@ -7,7 +7,7 @@ import sys + from collections import defaultdict + from itertools import chain + +-from pipenv.vendor import attr ++import attr + import six + from cached_property import cached_property + from ..compat import Path, fs_str +diff --git a/pipenv/vendor/pythonfinder/models/python.py b/pipenv/vendor/pythonfinder/models/python.py +index 4f7e5563..d001a1e5 100644 +--- a/pipenv/vendor/pythonfinder/models/python.py ++++ b/pipenv/vendor/pythonfinder/models/python.py +@@ -7,7 +7,7 @@ import platform + import sys + from collections import defaultdict + +-from pipenv.vendor import attr ++import attr + import six + from packaging.version import Version + +diff --git a/pipenv/vendor/pythonfinder/models/windows.py b/pipenv/vendor/pythonfinder/models/windows.py +index c69b9484..fb36a272 100644 +--- a/pipenv/vendor/pythonfinder/models/windows.py ++++ b/pipenv/vendor/pythonfinder/models/windows.py +@@ -4,7 +4,7 @@ from __future__ import absolute_import, print_function + import operator + from collections import defaultdict + +-from pipenv.vendor import attr ++import attr + + from ..environment import MYPY_RUNNING + from ..exceptions import InvalidPythonVersion +diff --git a/pipenv/vendor/pythonfinder/utils.py b/pipenv/vendor/pythonfinder/utils.py +index bcea7f3e..41d2d59a 100644 +--- a/pipenv/vendor/pythonfinder/utils.py ++++ b/pipenv/vendor/pythonfinder/utils.py +@@ -10,7 +10,7 @@ from collections import OrderedDict + from fnmatch import fnmatch + from threading import Timer + +-from pipenv.vendor import attr ++import attr + import six + from packaging.version import LegacyVersion, Version + diff --git a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild new file mode 100644 index 00000000000..403619ae607 --- /dev/null +++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit distutils-r1 + +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}.tar.gz" +S="${WORKDIR}"/${PN}-${MY_PV} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +PATCHES="${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch" + +RDEPEND=" + ${PYTHON_DEPS} + dev-python/certifi[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}] + dev-python/virtualenv-clone[${PYTHON_USEDEP}] +" +BDEPEND=" + ${RDEPEND} + test? ( + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + ) +" + +src_prepare() { + # remove vendored version of PyYAML that is backported to Python2 + rm -vR "${S}/${PN}/patched/yaml2/" || die + # remove vendored versions + # see https://bugs.gentoo.org/717666 + rm -vR "${S}/${PN}/vendor/attr/" || die + rm -vR "${S}/${PN}/vendor/jinja2/" || die + distutils-r1_src_prepare +} + +python_test() { + pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die +}
