commit 838fe7e2375cb94e3055147f1dd1249957b29347 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Jul 2 07:28:53 2018 +1000 python3-packaging: update to remove bootstrap code diff --git a/python3-packaging/.footprint b/python3-packaging/.footprint index 752750882..6b3c5af29 100644 --- a/python3-packaging/.footprint +++ b/python3-packaging/.footprint @@ -2,12 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.6/ drwxr-xr-x root/root usr/lib/python3.6/site-packages/ -drwxr-xr-x root/root usr/lib/python3.6/site-packages/packaging-17.1-py3.6.egg-info/ --rw-r--r-- root/root usr/lib/python3.6/site-packages/packaging-17.1-py3.6.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.6/site-packages/packaging-17.1-py3.6.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/packaging-17.1-py3.6.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/packaging-17.1-py3.6.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/packaging-17.1-py3.6.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.6/site-packages/packaging/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/packaging/__about__.py -rw-r--r-- root/root usr/lib/python3.6/site-packages/packaging/__init__.py diff --git a/python3-packaging/.md5sum b/python3-packaging/.md5sum index f59d76ff5..01ff361eb 100644 --- a/python3-packaging/.md5sum +++ b/python3-packaging/.md5sum @@ -1,2 +1 @@ -a73d0534575b904d17913889dce5bd99 get-pip.py 8baf8241d1b6b0a5fae9b00f359976a8 packaging-17.1.tar.gz diff --git a/python3-packaging/.signature b/python3-packaging/.signature index cc1bf8842..e8ba4f7b9 100644 --- a/python3-packaging/.signature +++ b/python3-packaging/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UFB2cQ7thf73RdlPOcftwRvlFRKjESaIIaZrg1bhYSGcO4/xZacCqLYNIsP4RwrupZVBZyZO2psme0+r3TRkwA= -SHA256 (Pkgfile) = 744d4130cf0ed3e6fa622015456ddc092332e8447909e6a0e2f58f3fe08df4c7 -SHA256 (.footprint) = 12a486c5d9c871f40d0641d03f11ebde49f3a9c899a40d004bdc7a968a823ee7 +RWSE3ohX2g5d/RLcABfBasj6Gp5DS8FFyCDnW11MRL1avOlJvz4vHCEY6NmlFgDILA36GZpdlZ2p/pWWf2I9jsTcwNdt6LBa7wc= +SHA256 (Pkgfile) = 60d66f1848922164c924ba48d7f8c9f879bdf38e0f3802153f1985e4cc8b5027 +SHA256 (.footprint) = fbaf3a38f683810b2cf2ebc53813e05dbab4f835ce4a9b093d65dfac63d4e426 SHA256 (packaging-17.1.tar.gz) = f019b770dd64e585a99714f1fd5e01c7a8f11b45635aa953fd41c689a657375b -SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python3-packaging/Pkgfile b/python3-packaging/Pkgfile index 82bef972e..6c54efeaf 100644 --- a/python3-packaging/Pkgfile +++ b/python3-packaging/Pkgfile @@ -6,32 +6,17 @@ name=python3-packaging version=17.1 release=1 -source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz - https://crux.ster.zone/downloads/get-pip.py -# https://bootstrap.pypa.io/get-pip.py -) +source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz) build() { cd ${name#*-}-$version - 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 setup.py build - local PYTHONVERSION=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') + /usr/bin/python3 setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 - 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 setup.py build - - /usr/bin/python3 setup.py install \ - --prefix=/usr --root=$PKG --optimize=1 - fi + # remove sdist metadata, as wheel metadata will be used with python3-pip + find $PKG/usr/lib/python*/site-packages/ -maxdepth 1 -type f \ + -name "${name#*-}-$version-py*.egg-info" -delete }