commit 4ae2d82b3ee8d0af89537d888489e084821dcafc Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Jul 2 07:00:59 2018 +1000 python-packaging: update to remove bootstrap code diff --git a/python-packaging/.footprint b/python-packaging/.footprint index 712bcf96d..7241d4c5b 100644 --- a/python-packaging/.footprint +++ b/python-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/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/packaging-17.1-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/packaging-17.1-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/packaging-17.1-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/packaging-17.1-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/packaging-17.1-py2.7.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/packaging-17.1-py2.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python2.7/site-packages/packaging/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/packaging/__about__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/packaging/__about__.pyc diff --git a/python-packaging/.md5sum b/python-packaging/.md5sum index f59d76ff5..01ff361eb 100644 --- a/python-packaging/.md5sum +++ b/python-packaging/.md5sum @@ -1,2 +1 @@ -a73d0534575b904d17913889dce5bd99 get-pip.py 8baf8241d1b6b0a5fae9b00f359976a8 packaging-17.1.tar.gz diff --git a/python-packaging/.signature b/python-packaging/.signature index aa5f50144..5a7827799 100644 --- a/python-packaging/.signature +++ b/python-packaging/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SfpjoV+qnpqlEahpoFiWXhT2+JHGZNPaE4A63PaXZQpsfg1puONW9jcp7MfHcuOcNc3Dhn4LkzSgXibrhK9DQY= -SHA256 (Pkgfile) = f1b7fb601d4a80a6decce527b182f6b59d4d5da3ce035d505c33d97d37f79e6c -SHA256 (.footprint) = 43e363981897f16c9a443b8c68a7b3228349bb902ed63366ab7a2402939eb7e0 +RWSE3ohX2g5d/cY9UhIGSfjnaiAn8GtX8LvX5Vh7p+Etm1WKFl30INebKgXVBjCrnY507geDbXltloaJwGTz5/ldPjSAzwP/OQ0= +SHA256 (Pkgfile) = 240d53eb61d5d9e6bc7f2004c8c9232412434320fc30763c68c5e7a38305fcf7 +SHA256 (.footprint) = 957b630acad8ff03d2f1e51dfd4bc853f88c0f889b0c209579b8cf44013745b3 SHA256 (packaging-17.1.tar.gz) = f019b770dd64e585a99714f1fd5e01c7a8f11b45635aa953fd41c689a657375b -SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python-packaging/Pkgfile b/python-packaging/Pkgfile index e1d8e2798..6686dc02f 100644 --- a/python-packaging/Pkgfile +++ b/python-packaging/Pkgfile @@ -1,37 +1,22 @@ # Description: Core utilities for Python packages. # URL: https://pypi.python.org/pypi/packaging/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: python-pyparsing python-six +# Depends on: python name=python-packaging version=17.1 -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 }