commit: 685f93af6c7131bd05b95cbb45e94a89fd3459f8 Author: Oz N Tiram <oz.tiram <AT> gmail <DOT> com> AuthorDate: Sun Dec 26 01:21:26 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 9 01:22:38 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=685f93af
dev-python/pipenv: drop 2021.5.29-r2 Signed-off-by: Oz N Tiram <oz.tiram <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23516 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-python/pipenv/Manifest | 1 - ...nv-2021-5-29-r2-remove-attr-vendor-import.patch | 95 ---------------------- ...021-5-29-r2-remove-colorama-vendor-import.patch | 18 ---- dev-python/pipenv/pipenv-2021.5.29-r2.ebuild | 61 -------------- 4 files changed, 175 deletions(-) diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest index 9bce1fb9615a..621cd3ceea21 100644 --- a/dev-python/pipenv/Manifest +++ b/dev-python/pipenv/Manifest @@ -1,3 +1,2 @@ DIST pipenv-2021.11.23.tar.gz 11378116 BLAKE2B aa30c86aa3b20333d0bffc8c49761869cc9e86b69920abe5e58a0aa7ccf35a8faf6b8b29ce408c85239624a999ca4e67f4a687e1e9aa15271bea31a135acdb7d SHA512 3873a3e7de33677b63bb133e397f46030ec28a24479b38009a4c409d93277327e8f53694fa56fdb8120f9cd632e849fde6f4205e29d9f5704c8844101e8e8298 DIST pipenv-2021.11.9.tar.gz 11652360 BLAKE2B ab7d733e0c44a8551d2b786680646f5efa9effdc6b6a74fc0b8286336c84b9795229036cc8b7179a4ee3d6c91701d82fdd2e8303c7c9a9da1e06eb78fb2a0214 SHA512 6ad44fe70d3e3f5bbdedb891c76ad1c37863e6f4215c34f2ef6aa1a35b89fb6262f8c55f7f2e71544e550d66d20567f12ce4698f9e3a899853aa49a0849c3189 -DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch deleted file mode 100644 index 3437c2a2f33f..000000000000 --- a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch +++ /dev/null @@ -1,95 +0,0 @@ -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/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch deleted file mode 100644 index 5c50788d0320..000000000000 --- a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/pipenv/patched/crayons.py b/pipenv/patched/crayons.py -index d7644a21..19b0d695 100644 ---- a/pipenv/patched/crayons.py -+++ b/pipenv/patched/crayons.py -@@ -13,7 +13,7 @@ import re - import sys - - from pipenv.vendor import shellingham --from pipenv.vendor import colorama -+import colorama - - PY3 = sys.version_info[0] >= 3 - -Submodule tests/pypi f5530013..1881ecb4 (rewind): - < Update setuptools version - < Add sha256 checksum files - < Update url reference - < Add pep 508 subdirectory fixtures diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild deleted file mode 100644 index 77de678dfaf3..000000000000 --- a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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_{8..10} ) - -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" - "${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-colorama-vendor-import.patch" - ) - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/attrs[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0.1[${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/colorama/" || 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 -}
