commit bbcd31c03def9cea9fa4fa2d237882f020fe5a38 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Jul 2 07:06:56 2018 +1000 python-six: update to remove bootstrap code diff --git a/python-six/.footprint b/python-six/.footprint index 71812073a..5ded15070 100644 --- a/python-six/.footprint +++ b/python-six/.footprint @@ -2,11 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/six-1.11.0-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.11.0-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.11.0-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.11.0-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.11.0-py2.7.egg-info/top_level.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/six.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/six.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/six.pyo diff --git a/python-six/.md5sum b/python-six/.md5sum index b06eb5337..a7669949c 100644 --- a/python-six/.md5sum +++ b/python-six/.md5sum @@ -1,2 +1 @@ -a73d0534575b904d17913889dce5bd99 get-pip.py d12789f9baf7e9fb2524c0c64f1773f8 six-1.11.0.tar.gz diff --git a/python-six/.signature b/python-six/.signature index fa42fc47b..6ebc7b096 100644 --- a/python-six/.signature +++ b/python-six/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aIwJ0PewWtb1xZZ4KYUaJ+c3T7dkstdOhQNYcZhlmtK5gdCE4iIxO3vSA5V6aNAFUNlN0abau+//nOuMEGoUg8= -SHA256 (Pkgfile) = 152dacc891fa2099dc9b2951ec7b7c19f89121c437fcd2dac6aaf8ceea906afa -SHA256 (.footprint) = 8a501c066df27c817701606d6bb3783c32179f22790718493d88c9badb2726fe +RWSE3ohX2g5d/aj+UBtDhlYr/Q1Vzsy7raLryoD2acbQh9kMonVLqthFQMuJr8ThM0d0qZdFspPo+f85ilXznB53aMS4w7/o0As= +SHA256 (Pkgfile) = 6ac70bd0f5e0368ea074702deeb581f5a504bcd6e0503169e17b6becc4f9795f +SHA256 (.footprint) = 2531e26ab6b1adeadbe2372fb58c813514c1da57182bf8c0bbd03c388cc769c5 SHA256 (six-1.11.0.tar.gz) = 70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 -SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python-six/Pkgfile b/python-six/Pkgfile index 26bae6d7b..4e2d0ae03 100644 --- a/python-six/Pkgfile +++ b/python-six/Pkgfile @@ -5,32 +5,18 @@ name=python-six version=1.11.0 -release=1 -source=(https://files.pythonhosted.org/packages/source/${name:7: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:7:1}/${name#*-}/${name#*-}-$version.tar.gz) build() { cd ${name#*-}-$version - if [ "$(pkginfo -i | egrep -c '^python-(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/python $SRC/get-pip.py --root=$SRC/build + /usr/bin/python setup.py build - local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + /usr/bin/python setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ - /usr/bin/python setup.py build - - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ - /usr/bin/python setup.py install \ - --prefix=/usr --root=$PKG --optimize=1 - else - /usr/bin/python setup.py build - - /usr/bin/python setup.py install \ - --prefix=/usr --root=$PKG --optimize=1 - fi + # remove sdist metadata, as wheel metadata will be used with python-pip + find $PKG/usr/lib/python*/site-packages/ -maxdepth 1 -type f \ + -name "${name#*-}-$version-py*.egg-info" -delete }