From f67dfdc56c09318b6acf797a9927fb1660e46463 Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Sat, 6 Aug 2022 11:40:16 +0200 Subject: dev-python/pipenv: drop 2022.6.7 Signed-off-by: Oz N Tiram Bug: https://bugs.gentoo.org/717666 Closes: https://github.com/gentoo/gentoo/pull/26757 Signed-off-by: Arthur Zamarin --- dev-python/pipenv/pipenv-2022.6.7.ebuild | 89 -------------------------------- dev-python/pipenv/pipenv-2022.8.5.ebuild | 3 +- 2 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 dev-python/pipenv/pipenv-2022.6.7.ebuild diff --git a/dev-python/pipenv/pipenv-2022.6.7.ebuild b/dev-python/pipenv/pipenv-2022.6.7.ebuild deleted file mode 100644 index 287a53485539..000000000000 --- a/dev-python/pipenv/pipenv-2022.6.7.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2022 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" - -RDEPEND=" - dev-python/attrs[${PYTHON_USEDEP}] - dev-python/cached-property[${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/idna-3.2[${PYTHON_USEDEP}] - dev-python/iso8601[${PYTHON_USEDEP}] - >=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.2[${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/toml[${PYTHON_USEDEP}] - >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.26.7[${PYTHON_USEDEP}] - >=dev-python/wheel-0.36.0[${PYTHON_USEDEP}] - >=dev-python/zipp-3.6.0[${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 cerberus cached_property click colorama idna iso8601 pexpect dateutil requests toml tomli urllib3 zipp ) - 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 - - # not actually used by pipenv, but included in pipenv - rm -vR "${S}/${PN}/vendor/wheel/" || die -} - -python_test() { - epytest -m "not cli and not needs_internet" tests/unit/ -} diff --git a/dev-python/pipenv/pipenv-2022.8.5.ebuild b/dev-python/pipenv/pipenv-2022.8.5.ebuild index 313e145ce0ce..0b3e0cf96b7f 100644 --- a/dev-python/pipenv/pipenv-2022.8.5.ebuild +++ b/dev-python/pipenv/pipenv-2022.8.5.ebuild @@ -59,7 +59,8 @@ distutils_enable_tests pytest src_prepare() { local pkgName local jobs=$(makeopts_jobs) - local packages=( attr cerberus cached_property click colorama idna importlib_metadata importlib_resources iso8601 pexpect dateutil pyparsing requests toml tomli tomlkit urllib3 zipp ) + local packages=( attr cerberus cached_property click colorama idna importlib_metadata \ + importlib_resources iso8601 pexpect dateutil pyparsing requests toml tomli tomlkit urllib3 zipp ) for pkgName in ${packages[@]}; do find ./ -type f -print0 | \ xargs --max-procs="${jobs}" --null \ -- cgit v1.2.3-65-gdbad