commit 3d938a457bbbd18343dbdf8dedaa7f2df527d511 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Jul 2 07:36:54 2018 +1000 python3-six: update to remove bootstrap code diff --git a/python3-six/.footprint b/python3-six/.footprint index 1360163a8..c0f4ef40b 100644 --- a/python3-six/.footprint +++ b/python3-six/.footprint @@ -5,9 +5,4 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/ drwxr-xr-x root/root usr/lib/python3.6/site-packages/__pycache__/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/__pycache__/six.cpython-36.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.6/site-packages/__pycache__/six.cpython-36.pyc -drwxr-xr-x root/root usr/lib/python3.6/site-packages/six-1.11.0-py3.6.egg-info/ --rw-r--r-- root/root usr/lib/python3.6/site-packages/six-1.11.0-py3.6.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.6/site-packages/six-1.11.0-py3.6.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/six-1.11.0-py3.6.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/six-1.11.0-py3.6.egg-info/top_level.txt -rw-r--r-- root/root usr/lib/python3.6/site-packages/six.py diff --git a/python3-six/.md5sum b/python3-six/.md5sum index b06eb5337..a7669949c 100644 --- a/python3-six/.md5sum +++ b/python3-six/.md5sum @@ -1,2 +1 @@ -a73d0534575b904d17913889dce5bd99 get-pip.py d12789f9baf7e9fb2524c0c64f1773f8 six-1.11.0.tar.gz diff --git a/python3-six/.signature b/python3-six/.signature index 2fb61331a..bd5b1c7f3 100644 --- a/python3-six/.signature +++ b/python3-six/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/eR2oHHWzQEDfvqJ78Xv5yWRJRmAD4RkC/nH3lbO+VuYuC/YynL3SW7qmRkGyUjqKEGiqp+LGLeqxy+OSKfRlAY= -SHA256 (Pkgfile) = 49f046cf1ea766b3d0959a051c038caba3790bd58059e3531fdbeeeda669594e -SHA256 (.footprint) = 13e3aa8ef99328fcf63215effd58961bebd44fb96499b14136249ec5e20725c0 +RWSE3ohX2g5d/bNmGrESop5acOGFyfwoQIP4BacH7tHySTTCigrmyt6Sd79ivopGbsHbdED/Bt/v4rERUMSKKds3J1WXg/zQIw0= +SHA256 (Pkgfile) = 963316b3fb46cb75bdfd615052487abbe8a67ec49fe9b0d943caa21138adecf4 +SHA256 (.footprint) = ed853358ba20ad17645d6c3db79d04005081513c69e4fd095f895fb9bb93f608 SHA256 (six-1.11.0.tar.gz) = 70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 -SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python3-six/Pkgfile b/python3-six/Pkgfile index 4859c44e0..bf0c37cc2 100644 --- a/python3-six/Pkgfile +++ b/python3-six/Pkgfile @@ -5,32 +5,18 @@ name=python3-six version=1.11.0 -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 -) +release=2 +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 }