commit 7b3e8ea61ac74d223f459fc449c57404fae056f1 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Jul 2 07:36:28 2018 +1000 [notify] python3-setuptools: update to remove bootstrap code dependency changes removed: python3-appdirs python3-packaging python3-pip added: python3 diff --git a/python3-setuptools/.md5sum b/python3-setuptools/.md5sum index edb0ed962..394076092 100644 --- a/python3-setuptools/.md5sum +++ b/python3-setuptools/.md5sum @@ -1,2 +1 @@ -a73d0534575b904d17913889dce5bd99 get-pip.py dd4e3fa83a21bf7bf9c51026dc8a4e59 setuptools-39.2.0.zip diff --git a/python3-setuptools/.signature b/python3-setuptools/.signature index 175966d34..1b253dade 100644 --- a/python3-setuptools/.signature +++ b/python3-setuptools/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/TqpsB3fhkcEAfoJ7AzEmmczf4B3GgghFXddC6Giop3D01lUmrukwFcDIIs3w1Ry8BT8zmeefQgKzJ8WG5VEhAo= -SHA256 (Pkgfile) = 96ee6d15bcee110d201b53a253a0639bebc43b46b48c3236ab173268bd114f5b +RWSE3ohX2g5d/Y/lRT+kNrdD407aM17ABjoq1ApDdqjNlbRPKQ+lEd9Jc5F1vT0g2ZcKFJEdScdHwh21OuUI6QI0v74MvmrjsQs= +SHA256 (Pkgfile) = 523415cc00df9c0caa136c52f16fc4eaf59cc73d3a8b289fff2a97474da516df SHA256 (.footprint) = ca0aa0a4fa2f8cb780750bcb00c0c15e45936903ca130d7f38a5d21e94f842ad SHA256 (setuptools-39.2.0.zip) = f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2 -SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python3-setuptools/Pkgfile b/python3-setuptools/Pkgfile index 0315d6a18..f877fd295 100644 --- a/python3-setuptools/Pkgfile +++ b/python3-setuptools/Pkgfile @@ -1,47 +1,23 @@ # Description: Easily download, build, install, upgrade, and uninstall Python packages. # URL: https://pypi.python.org/pypi/setuptools # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: python3-appdirs python3-packaging python3-pip +# Depends on: python3 name=python3-setuptools version=39.2.0 -release=1 -source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.zip - https://crux.ster.zone/downloads/get-pip.py -# https://bootstrap.pypa.io/get-pip.py -) +release=2 +source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.zip) build() { cd ${name#*-}-$version export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 - if [ "$(pkginfo -i | egrep -c '^python3-(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then - install -d build - sed -i 's/"--upgrade"/"--upgrade", "--upgrade-strategy", "only-if-needed"/' $SRC/get-pip.py - /usr/bin/python3 $SRC/get-pip.py --root=$SRC/build + /usr/bin/python3 bootstrap.py + /usr/bin/python3 setup.py build - local PYTHONVERSION=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') - - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ - /usr/bin/python3 bootstrap.py - - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ - /usr/bin/python3 setup.py build - - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ - /usr/bin/python3 setup.py install \ - --prefix=/usr --root=$PKG --optimize=1 - else - - /usr/bin/python3 bootstrap.py - /usr/bin/python3 setup.py build - - /usr/bin/python3 setup.py install \ - --prefix=/usr --root=$PKG --optimize=1 - fi - - unset SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES + /usr/bin/python3 setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 rm $PKG/usr/bin/easy_install }