pypi: update the base pypi url to use the package info without requiring the hash

* Things have finally settled on a URL structure without needing the hash
     (See https://bitbucket.org/pypa/pypi/issues/438/backwards-compatible-un-hashed-package)

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Derek Straka
2016-06-23 11:53:43 -04:00
committed by Martin Jansa
parent 216e95669c
commit 7edad4def4
22 changed files with 1 additions and 28 deletions

View File

@@ -12,12 +12,8 @@ PYPI_PACKAGE_EXT ?= "tar.gz"
def pypi_src_uri(d):
package = d.getVar('PYPI_PACKAGE', True)
package_ext = d.getVar('PYPI_PACKAGE_EXT', True)
package_hash = d.getVar('PYPI_PACKAGE_HASH', True)
pv = d.getVar('PV', True)
if package_hash:
return 'https://pypi.python.org/packages/%s/%s/%s/%s-%s.%s' % ( package_hash[:2], package_hash[2:4], package_hash[4:], package, pv, package_ext)
else:
return 'https://pypi.python.org/packages/source/%s/%s/%s-%s.%s' % (package[0], package, package, pv, package_ext)
return 'https://files.pythonhosted.org/packages/source/%s/%s/%s-%s.%s' % (package[0], package, package, pv, package_ext)
PYPI_SRC_URI ?= "${@pypi_src_uri(d)}"