diff options
author | Derek Straka <derek@asterius.io> | 2016-06-23 11:53:43 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-11 15:16:04 +0200 |
commit | 7edad4def408cc1bd29d6a5a247e11af1180fc2e (patch) | |
tree | e2bbe2e1d8da356f091105871b1382ad8c317c1e /meta-python/classes | |
parent | 216e95669c6b884735f3f8a5ca1ee37a28d68b3e (diff) | |
download | meta-openembedded-7edad4def408cc1bd29d6a5a247e11af1180fc2e.tar.gz |
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>
Diffstat (limited to 'meta-python/classes')
-rw-r--r-- | meta-python/classes/pypi.bbclass | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meta-python/classes/pypi.bbclass b/meta-python/classes/pypi.bbclass index 5b96c01a7..cd27cd24e 100644 --- a/meta-python/classes/pypi.bbclass +++ b/meta-python/classes/pypi.bbclass | |||
@@ -12,12 +12,8 @@ PYPI_PACKAGE_EXT ?= "tar.gz" | |||
12 | def pypi_src_uri(d): | 12 | def pypi_src_uri(d): |
13 | package = d.getVar('PYPI_PACKAGE', True) | 13 | package = d.getVar('PYPI_PACKAGE', True) |
14 | package_ext = d.getVar('PYPI_PACKAGE_EXT', True) | 14 | package_ext = d.getVar('PYPI_PACKAGE_EXT', True) |
15 | package_hash = d.getVar('PYPI_PACKAGE_HASH', True) | ||
16 | pv = d.getVar('PV', True) | 15 | pv = d.getVar('PV', True) |
17 | if package_hash: | 16 | return 'https://files.pythonhosted.org/packages/source/%s/%s/%s-%s.%s' % (package[0], package, package, pv, package_ext) |
18 | 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) | ||
19 | else: | ||
20 | return 'https://pypi.python.org/packages/source/%s/%s/%s-%s.%s' % (package[0], package, package, pv, package_ext) | ||
21 | 17 | ||
22 | PYPI_SRC_URI ?= "${@pypi_src_uri(d)}" | 18 | PYPI_SRC_URI ?= "${@pypi_src_uri(d)}" |
23 | 19 | ||