Date: Monday, November 29, 2021 @ 13:26:42 Author: jelle Revision: 429443
Drop python2-virtualenv Nothing in our repository requires it and our Python2 packages is now a build/runtime dependency only. Modified: python-virtualenv/trunk/PKGBUILD ----------+ PKGBUILD | 40 +++++++--------------------------------- 1 file changed, 7 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-11-29 12:11:36 UTC (rev 429442) +++ PKGBUILD 2021-11-29 13:26:42 UTC (rev 429443) @@ -3,20 +3,18 @@ # Contributor: Daniele Paolella <d...@mcrservice.it> pkgbase=python-virtualenv -pkgname=('python-virtualenv' 'python2-virtualenv') +pkgname=python-virtualenv pkgver=20.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Virtual Python Environment builder" url="https://virtualenv.pypa.io/" arch=('any') license=('MIT') +depends=('python-platformdirs' 'python-distlib' 'python-filelock' 'python-six' + 'python-importlib-metadata') makedepends=('python-setuptools' 'python-platformdirs' 'python-distlib' 'python-filelock' - 'python-six' 'python2-setuptools' 'python2-platformdirs' 'python2-distlib' - 'python2-filelock' 'python2-six' 'python2-importlib-metadata' - 'python2-importlib_resources' 'python2-pathlib2' 'python-setuptools-scm' - 'python2-setuptools-scm' 'python-sphinx' 'python-sphinx_rtd_theme' - 'python-sphinx-argparse' 'towncrier' 'python-importlib-metadata' - 'python2-backports.entry-points-selectable') + 'python-six' 'python-setuptools-scm' 'python-sphinx' 'python-sphinx_rtd_theme' + 'python-sphinx-argparse' 'towncrier' 'python-importlib-metadata') checkdepends=('python-pytest-freezegun' 'python-pytest-mock' 'python-pip' 'python-coverage' 'fish' 'xonsh' 'python-flaky') # 'tcsh' removed: randomly hangs tests replaces=('virtualenv') @@ -34,8 +32,6 @@ # workaround pip vendorod certifi sed -i "s|pkgutil.get_data(\"pip._vendor.certifi\", \"cacert.pem\")|open(os.path.join('/etc/ssl/certs/ca-certificates.crt'), 'rb').read()|" virtualenv-$pkgver/tests/conftest.py - cp -a virtualenv-$pkgver{,-py2} - # Use importlib-metadata directly for Python 3.9 sed -i 's/from backports.entry_points_selectable import entry_points/from importlib_metadata import entry_points/' virtualenv-$pkgver/src/virtualenv/run/plugin/base.py sed -i '/backports.entry_points_selectable/d' virtualenv-$pkgver/setup.cfg @@ -47,9 +43,6 @@ export PYTHONPATH="$PWD/build/lib:$PWD/src" sphinx-build -b man docs docs/_build/man ) - (cd virtualenv-$pkgver-py2 - python2 setup.py build egg_info - ) } check() { @@ -57,10 +50,7 @@ PYTHONPATH="$PWD/build/lib:$PWD/src" python -m pytest } -package_python-virtualenv() { - depends=('python-platformdirs' 'python-distlib' 'python-filelock' 'python-six' - 'python-importlib-metadata') - +package() { cd virtualenv-$pkgver python setup.py install --prefix=/usr --root="$pkgdir" --skip-build install -Dm 644 docs/_build/man/virtualenv.1 "${pkgdir}/usr/share/man/man1/virtualenv.1" @@ -72,19 +62,3 @@ install -D -m644 LICENSE -t \ "$pkgdir"/usr/share/licenses/$pkgname/ } - -package_python2-virtualenv() { - depends=('python2-platformdirs' 'python2-distlib' 'python2-filelock' 'python2-six' - 'python2-importlib-metadata' 'python2-importlib_resources' 'python2-pathlib2' - 'python2-backports.entry-points-selectable') - - cd virtualenv-$pkgver-py2 - python2 setup.py install --prefix=/usr --root="$pkgdir" --skip-build - install -Dm 644 ../virtualenv-$pkgver/docs/_build/man/virtualenv.1 "${pkgdir}/usr/share/man/man1/virtualenv2.1" - - # move this "old" version out of the way - mv "$pkgdir/usr/bin/virtualenv" "$pkgdir/usr/bin/virtualenv2" - - install -D -m644 LICENSE -t \ - "$pkgdir"/usr/share/licenses/$pkgname/ -}