Date: Monday, November 9, 2020 @ 11:54:35 Author: felixonmars Revision: 399685
upgpkg: python-setuptools 1:50.3.2-2: bootstrap for python 3.9 Modified: python-setuptools/trunk/PKGBUILD ----------+ PKGBUILD | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-11-09 11:49:28 UTC (rev 399684) +++ PKGBUILD 2020-11-09 11:54:35 UTC (rev 399685) @@ -4,7 +4,7 @@ pkgname=python-setuptools pkgver=50.3.2 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" arch=('any') @@ -23,7 +23,7 @@ export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 prepare() { - rm -r setuptools-$pkgver/{pkg_resources,setuptools}/{extern,_vendor} + # rm -r setuptools-$pkgver/{pkg_resources,setuptools}/{extern,_vendor} # Upstream devendoring logic is badly broken, see: # https://bugs.archlinux.org/task/58670 @@ -31,14 +31,14 @@ # https://github.com/pypa/setuptools/issues/1383 # The simplest fix is to simply rewrite import paths to use the canonical # location in the first place - for _module in setuptools pkg_resources '' ; do - find setuptools-$pkgver -name \*.py -exec sed -i \ - -e 's/from '$_module.extern' import/import/' \ - -e 's/from '$_module.extern'./from /' \ - -e 's/import '$_module.extern'./import /' \ - -e "s/__import__('$_module.extern./__import__('/" \ - {} + - done + # for _module in setuptools pkg_resources '' ; do + # find setuptools-$pkgver -name \*.py -exec sed -i \ + # -e 's/from '$_module.extern' import/import/' \ + # -e 's/from '$_module.extern'./from /' \ + # -e 's/import '$_module.extern'./import /' \ + # -e "s/__import__('$_module.extern./__import__('/" \ + # {} + + # done # Fix for flake8 sed -i 's/import six, ordered_set/import six\nimport ordered_set/' setuptools-$pkgver/setuptools/command/sdist.py