diff options
Diffstat (limited to 'dev-python/pipenv')
4 files changed, 161 insertions, 0 deletions
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest index 8dcf2c599b06..dc09b089d5e2 100644 --- a/dev-python/pipenv/Manifest +++ b/dev-python/pipenv/Manifest @@ -1,5 +1,9 @@ +AUX pipenv-2021-11-9-remove-attr-vendor-import.patch 628 BLAKE2B 2f94b5d3a45cf4cf8eb01e8f73e920c21c6487357cfcab34d8ab13d4ff77f803c5b1da6ac737cf595a23c536bb07f4cd321ca38aa57bdb266a5c066c2227c7b6 SHA512 81be2f0a8eed43da73ee1dab43e7597702e6f01c539381a80ab1cf75aa9285a26d269cf3f36417184a4e2e2499ea2799bcfeb8bdb61bdfa145b2baf253405676 +AUX pipenv-2021-11-9-remove-colorama-vendor-import.patch 2310 BLAKE2B 8cb032ab0d1018f0ce047ef5cfdb6ab729a227f569d6e513dd7a8c9ac0548fbc5f6db6b59e33c03095684d918a34879f8163f6e3a0213a0a4ef009bb423687ed SHA512 e692c0b544639fc820c647e3c267b58cf5669a16ec3a7ee89dbee93036a2add027b41c39edad6b62aa4273f332678dea302e35896868fee7fb28ad105a963790 AUX pipenv-2021-5-29-r2-remove-attr-vendor-import.patch 3064 BLAKE2B a292df872da96e643545dc3c0b8c27d40466f6b4fb76d0c19316021e103ab6ee3b4e18861f286fee96a004e4f8c1fb3889bd7285f790d31b7f81e49579ab13f1 SHA512 4301b2302648dea77809c3afda896f0f38e4fcde503a9810f8c1706e35b553bee8fc3bc803ff958b0afb0cde0b764854647416efadccab3541f284f3efde15ab AUX pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch 506 BLAKE2B 30447546cbf87a99d7914340708ef7cb8c60247957f0ee41b2cead21a476e7b9a8238661376d39fc60569478571b365f19c27b489511f744f8387f24f51319fc SHA512 57eee158b006f44a8676bc870f940a1b98a95eee2c50c1ce127d99add129b8bc02a2e4cd98f49912629c376c9119b3234d8bf418b19452ae9c8c4080f4d53682 +DIST pipenv-2021.11.9.tar.gz 11652360 BLAKE2B ab7d733e0c44a8551d2b786680646f5efa9effdc6b6a74fc0b8286336c84b9795229036cc8b7179a4ee3d6c91701d82fdd2e8303c7c9a9da1e06eb78fb2a0214 SHA512 6ad44fe70d3e3f5bbdedb891c76ad1c37863e6f4215c34f2ef6aa1a35b89fb6262f8c55f7f2e71544e550d66d20567f12ce4698f9e3a899853aa49a0849c3189 DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd +EBUILD pipenv-2021.11.9.ebuild 1793 BLAKE2B e17672eacd26f09bd912adeb2fc5995cd28899a2e7f7e04b94d6af12a4468a1248897c1ce587a2f88c36d002de74d90447a0fcf9713398f36dc36d6965e077ba SHA512 e07d6ab4da4c1868cb412cf8987b23490c70665b3d71b4b603ff45fff812d66967cd91dac21333497eba9edc77a2516c2839eecb78707a6c7725ca6838fc1ba2 EBUILD pipenv-2021.5.29-r2.ebuild 1680 BLAKE2B d510881c66e8b17e057b1cec72721f603e36c95ed63599ced8456db1aa9b425869aaec34f827b8db1573e00f0c4aca168010749883c7605e034af3a6f4ad70cc SHA512 e65004e4a88165179b4c48acd59c2f4870dbd79809b7d31d82e23e62d0c498e0cf51a9fcc770872a21b1521ce3c2345d7d8163de97e57ce096b3816444c61aab MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282 diff --git a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch new file mode 100644 index 000000000000..2454d04f12ef --- /dev/null +++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch @@ -0,0 +1,25 @@ +From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001 +From: Oz N Tiram <oz.tiram@gmail.com> +Date: Thu, 11 Nov 2021 13:05:13 +0100 +Subject: [PATCH 1/2] Remove vendored attr. + +--- + pipenv/installers.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pipenv/installers.py b/pipenv/installers.py +index 5baa1933..f7982ab6 100644 +--- a/pipenv/installers.py ++++ b/pipenv/installers.py +@@ -3,7 +3,7 @@ import operator + import re + from abc import ABCMeta, abstractmethod + +-from pipenv.vendor import attr ++import attr + from pipenv.utils import find_windows_executable, subprocess_run + + +-- +2.32.0 + diff --git a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch new file mode 100644 index 000000000000..4677b0860da2 --- /dev/null +++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch @@ -0,0 +1,67 @@ +From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001 +From: Oz N Tiram <oz.tiram@gmail.com> +Date: Thu, 11 Nov 2021 13:05:41 +0100 +Subject: [PATCH 2/2] Remove vendored colorama + +--- + pipenv/patched/crayons.py | 2 +- + pipenv/vendor/yaspin/core.py | 2 +- + tasks/vendoring/patches/patched/crayons.patch | 2 +- + tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +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 + +diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py +index d8a0716c..c9be016c 100644 +--- a/pipenv/vendor/yaspin/core.py ++++ b/pipenv/vendor/yaspin/core.py +@@ -19,7 +19,7 @@ import time + from typing import List, Set, Union + + from termcolor import colored +-from pipenv.vendor import colorama ++import colorama + from pipenv.vendor.vistir import cursor + + from .base_spinner import Spinner, default_spinner +diff --git a/tasks/vendoring/patches/patched/crayons.patch b/tasks/vendoring/patches/patched/crayons.patch +index 2760ca81..d021bfb1 100644 +--- a/tasks/vendoring/patches/patched/crayons.patch ++++ b/tasks/vendoring/patches/patched/crayons.patch +@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644 + - + -import colorama + +from pipenv.vendor import shellingham +-+from pipenv.vendor import colorama +++import colorama + + +PY3 = sys.version_info[0] >= 3 + + +diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch +index 705650c3..95feb1c0 100644 +--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch ++++ b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch +@@ -6,7 +6,7 @@ index 76dc2439..d8a0716c 100644 + from typing import List, Set, Union + + from termcolor import colored +-+from pipenv.vendor import colorama +++import colorama + +from pipenv.vendor.vistir import cursor + + from .base_spinner import Spinner, default_spinner +-- +2.32.0 + diff --git a/dev-python/pipenv/pipenv-2021.11.9.ebuild b/dev-python/pipenv/pipenv-2021.11.9.ebuild new file mode 100644 index 000000000000..7fa754b6731a --- /dev/null +++ b/dev-python/pipenv/pipenv-2021.11.9.ebuild @@ -0,0 +1,65 @@ +# 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//./-}-remove-attr-vendor-import.patch" + "${FILESDIR}/${PN}-${PV//./-}-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}] + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + >=dev-python/wheel-0.36.0[${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 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/requests/" || die + # not actually used by pipenv, but included in pipenv + rm -vR "${S}/${PN}/vendor/jinja2/" || die + rm -vR "${S}/${PN}/vendor/wheel/" || die + distutils-r1_src_prepare +} + +python_test() { + pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die +} |