From 861ffe012c63c48053fb77b5110cbe900f651dfd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 9 Oct 2022 19:32:31 +0100 Subject: gentoo auto-resync : 09:10:2022 - 19:32:30 --- dev-python/pipenv/Manifest | 3 +- .../pipenv-2022.9.24-inject-site-packages.patch | 34 ++++++++ dev-python/pipenv/pipenv-2022.9.24-r1.ebuild | 92 ++++++++++++++++++++++ dev-python/pipenv/pipenv-2022.9.24.ebuild | 88 --------------------- 4 files changed, 128 insertions(+), 89 deletions(-) create mode 100644 dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch create mode 100644 dev-python/pipenv/pipenv-2022.9.24-r1.ebuild delete mode 100644 dev-python/pipenv/pipenv-2022.9.24.ebuild (limited to 'dev-python/pipenv') diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest index 7fd0b24b2010..a7ef42b34e62 100644 --- a/dev-python/pipenv/Manifest +++ b/dev-python/pipenv/Manifest @@ -1,5 +1,6 @@ +AUX pipenv-2022.9.24-inject-site-packages.patch 1155 BLAKE2B 61f296dd1f8168b86f17a55359c75febfc02807dd97c750217b46bd017b7bf73cf6fde0fcd2afa95908bd3e1cd7b50f626459f1a19f47b1c34ecdbea39fcfb7c SHA512 3a26ce6217fbf86eda1bb8266928dffe5fc1a55e4f7b66d0ade5ea31deff9cb68427f424995e4c8d402737e90ca9358a3a00364a4167667fae9a4bd018100ebc DIST pipenv-2022.8.5.gh.tar.gz 11841656 BLAKE2B 28869e75c1130285807b067720e696463106ed0ef1f4e685c95277d6e58e1d0371ed7afb1de4955d7a4b21b57b81163ea821e227ef26fc35b39dfc6df8dea873 SHA512 17ea8e99aaa54972baa25e2380e0a19c75f7d6cf5a8c238786f7c7c8269ef25ef316b8087483c9716e97493bcf4fe606eb9af7f082c09dd326547ec3cb4a406e DIST pipenv-2022.9.24.gh.tar.gz 11543711 BLAKE2B e875068383c8ca55864bfcb53288ae9a02adc578c09ad7392bf50a7ebe07e2eb5944bc225cfefad2ca8265d8dcbb17af96b34e8c0fd51a709921148207021f2b SHA512 d29a728d914d8c762469fd2d72de7be41050165b4587c3304ebc03235a1946967f78473651e1834e5a69a35395d0cf9087e1515fd746450057774fc22e61e092 EBUILD pipenv-2022.8.5.ebuild 3230 BLAKE2B dfd93ccc38d554e4f336c88e309ead48db88035c2ba9a66b2a3d352f057e2ca8d111cae2825f64cce322be2d1c443e3f3058b807b067646b001688f9204f3cec SHA512 2f6d4ccf1c31ce0b86d84e1972c971435976f016b0f820f38e1168abef70be0b2f1dfc78148d6432df57bfad959670abe2b68a4f248ebbe3a88c30bacd80f752 -EBUILD pipenv-2022.9.24.ebuild 3065 BLAKE2B 22792aea8a60d9ec8ae9127a737f96c6d7d0ca6f21b97a5ea12b4621da58ea1c65c5e13756646f8a6ecbd3497da81bcd5e3bc09a14357716741aed46e5d92bd0 SHA512 6d406113c7423b06bb007a93f1b657507cc5590d8e71c7dcf897ddd4e6083038050f7e454b99a6fa2826acf4af2fcc43bb0a5d4c6cdf7ff7c2cb14debc8a189c +EBUILD pipenv-2022.9.24-r1.ebuild 3137 BLAKE2B 5beb68c4ca7aad9d8d8c5f17dc09b7e8078a26357618c5fd7044b0107b77c5adf1983592ddeac79b98224f0cdc5ad3a39123e155a354fe1d57c264681a8b36bb SHA512 500e4bd9b9c5ff6359fd46c99a3c635827bc1ff7e6d0e4de19aa3ca62b4b92d260b9c04a3bb187ac158c1c322b361974ed7a237ddae055a995d08b1debed967c MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282 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 new file mode 100644 index 000000000000..04cf0ed9e317 --- /dev/null +++ b/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch @@ -0,0 +1,34 @@ +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/pipenv-2022.9.24-r1.ebuild b/dev-python/pipenv/pipenv-2022.9.24-r1.ebuild new file mode 100644 index 000000000000..b8d229b0fe29 --- /dev/null +++ b/dev-python/pipenv/pipenv-2022.9.24-r1.ebuild @@ -0,0 +1,92 @@ +# 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" + +PATCHES=( + "${FILESDIR}/pipenv-2022.9.24-inject-site-packages.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/idna-3.2[${PYTHON_USEDEP}] + >=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/pyparsing[${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/tomlkit[${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/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 click colorama idna importlib_metadata \ + importlib_resources pexpect pyparsing requests toml tomli tomlkit urllib3 ) + 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.9.24.ebuild b/dev-python/pipenv/pipenv-2022.9.24.ebuild deleted file mode 100644 index 26627daa805b..000000000000 --- a/dev-python/pipenv/pipenv-2022.9.24.ebuild +++ /dev/null @@ -1,88 +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/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/pexpect-4.8.0[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pyparsing[${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/tomlkit[${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/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 click colorama idna importlib_metadata \ - importlib_resources pexpect pyparsing requests toml tomli tomlkit urllib3 ) - 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/ -} -- cgit v1.2.3