[arch-commits] Commit in python-setuptools/trunk (PKGBUILD)

[Evangelos Foutras]

    Date: Wednesday, December 1, 2021 @ 11:02:19
  Author: foutrelis
Revision: 429910

upgpkg: python-setuptools 1:57.4.0-5: undo vendoring

Modified:
  python-setuptools/trunk/PKGBUILD

----------+
 PKGBUILD |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-01 10:45:21 UTC (rev 429909)
+++ PKGBUILD	2021-12-01 11:02:19 UTC (rev 429910)
@@ -4,15 +4,14 @@
 
 pkgname=python-setuptools
 pkgver=57.4.0
-pkgrel=4
+pkgrel=5
 epoch=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
 arch=('any')
 license=('PSF')
 url="https://pypi.org/project/setuptools/"
-# depends=('python-appdirs' 'python-more-itertools' 'python-ordered-set' 'python-packaging'
-#          'python-pyparsing')
-depends=('python')
+depends=('python-appdirs' 'python-more-itertools' 'python-ordered-set' 'python-packaging'
+         'python-pyparsing')
 makedepends=('git')
 checkdepends=('python-jaraco.envs' 'python-jaraco.path' 'python-mock' 'python-pip'
               'python-pytest-fixture-config' 'python-pytest-flake8' 'python-pytest-virtualenv'
@@ -28,22 +27,22 @@
   # Bootstrap for proper metadata
   python -m ensurepip
 
-  # 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
-  # # https://github.com/pypa/pip/issues/5429
-  # # 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
+  # Upstream devendoring logic is badly broken, see:
+  # https://bugs.archlinux.org/task/58670
+  # https://github.com/pypa/pip/issues/5429
+  # 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
 
   # https://github.com/pypa/setuptools/issues/2466
   sed -i '/ignore:lib2to3 package is deprecated:DeprecationWarning/a \    ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning' \