Date: Thursday, October 4, 2018 @ 03:47:53 Author: eschwartz Revision: 389353
upgpkg: python-pipenv 2018.7.1-3 FS#59319 fix shell completions being generated incorrectly Patch setup.py to not download unnecessary modules from PyPI on every build. Added: python-pipenv/trunk/0001-setup-don-t-setup_requires-on-things-used-to-run-dev.patch Modified: python-pipenv/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-setup-don-t-setup_requires-on-things-used-to-run-dev.patch | 32 ++++++++++ PKGBUILD | 21 +++--- 2 files changed, 44 insertions(+), 9 deletions(-) Added: 0001-setup-don-t-setup_requires-on-things-used-to-run-dev.patch =================================================================== --- 0001-setup-don-t-setup_requires-on-things-used-to-run-dev.patch (rev 0) +++ 0001-setup-don-t-setup_requires-on-things-used-to-run-dev.patch 2018-10-04 03:47:53 UTC (rev 389353) @@ -0,0 +1,32 @@ +From 29c76d50b90fd7b9494c61b0f028287580172940 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwa...@archlinux.org> +Date: Wed, 15 Aug 2018 22:37:12 -0400 +Subject: [PATCH] setup: don't setup_requires on things used to run development + tasks + +It's not actually needed for setup.py, and is only used for: +- `invoke release.bump-version` +- `invoke release.tag-version` + +Including it in setup_requires is just something which ends up being +downloaded from PyPI as an egg, when doing possibly offline distro +packaging. +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7c87a2d6..179359f0 100644 +--- a/setup.py ++++ b/setup.py +@@ -130,7 +130,6 @@ setup( + ], + }, + python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', +- setup_requires=['invoke', 'parver'], + install_requires=required, + extras_require={}, + include_package_data=True, +-- +2.18.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-04 03:32:29 UTC (rev 389352) +++ PKGBUILD 2018-10-04 03:47:53 UTC (rev 389353) @@ -4,7 +4,7 @@ pkgbase=python-pipenv pkgname=(python-pipenv python2-pipenv) pkgver=2018.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Sacred Marriage of Pipfile, Pip, & Virtualenv." url="https://docs.pipenv.org" arch=('any') @@ -16,10 +16,13 @@ # 'python-virtualenv-clone' 'python-strict-rfc3339' # 'python-pytz' 'python-flaky' 'python-mock' # 'python2-pytest' 'python2-pytest-runner') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/pypa/pipenv/archive/v${pkgver}.tar.gz") -sha256sums=('e7428c4a3ac93b8ad0a7819e043191865fc75b93a4a26a7288bf2a12883bca7a') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/pypa/pipenv/archive/v${pkgver}.tar.gz" + "0001-setup-don-t-setup_requires-on-things-used-to-run-dev.patch") +sha256sums=('e7428c4a3ac93b8ad0a7819e043191865fc75b93a4a26a7288bf2a12883bca7a' + 'c518c4a1f761aa41eb5e54f92aab4b8322bff36f188d48f014059bd13e0b0eae') prepare() { + patch -p1 -d pipenv-$pkgver < 0001-setup-don-t-setup_requires-on-things-used-to-run-dev.patch cp -a pipenv-$pkgver{,-py2} } @@ -52,9 +55,9 @@ mv "${pkgdir}/usr/bin/pewtwo" "${pkgdir}/usr/bin/pewtwo2" mv "${pkgdir}/usr/bin/pipenv-resolver" "${pkgdir}/usr/bin/pipenv-resolver2" - SHELL=bash python2 -m pipenv --completion | sed 's/pipenv/pipenv2/g' | install -Dm644 /dev/stdin "${pkgdir}/usr/share/bash-completion/completions/pipenv2" - SHELL=zsh python2 -m pipenv --completion | sed 's/pipenv/pipenv2/g' | install -Dm644 /dev/stdin "${pkgdir}/usr/share/zsh/site-functions/_pipenv2" - SHELL=fish python2 -m pipenv --completion | sed 's/pipenv/pipenv2/g' | install -Dm644 /dev/stdin "${pkgdir}/usr/share/fish/vendor_completions.d/pipenv2.fish" + PIPENV_SHELL=bash python2 -m pipenv --completion | sed 's/pipenv/pipenv2/g' | install -Dm644 /dev/stdin "${pkgdir}/usr/share/bash-completion/completions/pipenv2" + PIPENV_SHELL=zsh python2 -m pipenv --completion | sed 's/pipenv/pipenv2/g' | install -Dm644 /dev/stdin "${pkgdir}/usr/share/zsh/site-functions/_pipenv2" + PIPENV_SHELL=fish python2 -m pipenv --completion | sed 's/pipenv/pipenv2/g' | install -Dm644 /dev/stdin "${pkgdir}/usr/share/fish/vendor_completions.d/pipenv2.fish" } package_python-pipenv() { @@ -64,7 +67,7 @@ python setup.py install --root="$pkgdir/" --optimize=1 --skip-build install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - SHELL=bash python -m pipenv --completion | install -Dm644 /dev/stdin "${pkgdir}/usr/share/bash-completion/completions/pipenv" - SHELL=zsh python -m pipenv --completion | install -Dm644 /dev/stdin "${pkgdir}/usr/share/zsh/site-functions/_pipenv" - SHELL=fish python -m pipenv --completion | install -Dm644 /dev/stdin "${pkgdir}/usr/share/fish/vendor_completions.d/pipenv.fish" + PIPENV_SHELL=bash python -m pipenv --completion | install -Dm644 /dev/stdin "${pkgdir}/usr/share/bash-completion/completions/pipenv" + PIPENV_SHELL=zsh python -m pipenv --completion | install -Dm644 /dev/stdin "${pkgdir}/usr/share/zsh/site-functions/_pipenv" + PIPENV_SHELL=fish python -m pipenv --completion | install -Dm644 /dev/stdin "${pkgdir}/usr/share/fish/vendor_completions.d/pipenv.fish" }