Merge #12625: depends: biplist 1.0.3
4ef82f1
depends: biplist 1.0.3 (fanquake)
Pull request description:
biplist should now be usable for reproducible builds without any patching.
One change has been incorporated, the two remaining changes were rejected upstream: https://bitbucket.org/wooster/biplist/pull-requests/9/make-biplist-ordering-deterministic/diff#comment-None
testing on gitian cc @jonasschnelli
Tree-SHA512: a3ef3ecad08b09f7a34d927bc4e3d8604099e9acb2c984bbe741df6162f4014f40e9eb2fd28309fc79d3dd2bb82f14bfd473925b90048e5fd135a471726a4836
This commit is contained in:
commit
c4219ff378
2 changed files with 3 additions and 37 deletions
|
@ -1,14 +1,9 @@
|
||||||
package=native_biplist
|
package=native_biplist
|
||||||
$(package)_version=0.9
|
$(package)_version=1.0.3
|
||||||
$(package)_download_path=https://pypi.python.org/packages/source/b/biplist
|
$(package)_download_path=https://bitbucket.org/wooster/biplist/downloads
|
||||||
$(package)_file_name=biplist-$($(package)_version).tar.gz
|
$(package)_file_name=biplist-$($(package)_version).tar.gz
|
||||||
$(package)_sha256_hash=b57cadfd26e4754efdf89e9e37de87885f9b5c847b2615688ca04adfaf6ca604
|
$(package)_sha256_hash=4c0549764c5fe50b28042ec21aa2e14fe1a2224e239a1dae77d9e7f3932aa4c6
|
||||||
$(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
|
$(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
|
||||||
$(package)_patches=sorted_list.patch
|
|
||||||
|
|
||||||
define $(package)_preprocess_cmds
|
|
||||||
patch -p1 < $($(package)_patch_dir)/sorted_list.patch
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
python setup.py build
|
python setup.py build
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
--- a/biplist/__init__.py 2014-10-26 19:03:11.000000000 +0000
|
|
||||||
+++ b/biplist/__init__.py 2016-07-19 19:30:17.663521999 +0000
|
|
||||||
@@ -541,7 +541,7 @@
|
|
||||||
return HashableWrapper(n)
|
|
||||||
elif isinstance(root, dict):
|
|
||||||
n = {}
|
|
||||||
- for key, value in iteritems(root):
|
|
||||||
+ for key, value in sorted(iteritems(root)):
|
|
||||||
n[self.wrapRoot(key)] = self.wrapRoot(value)
|
|
||||||
return HashableWrapper(n)
|
|
||||||
elif isinstance(root, list):
|
|
||||||
@@ -616,7 +616,7 @@
|
|
||||||
elif isinstance(obj, dict):
|
|
||||||
size = proc_size(len(obj))
|
|
||||||
self.incrementByteCount('dictBytes', incr=1+size)
|
|
||||||
- for key, value in iteritems(obj):
|
|
||||||
+ for key, value in sorted(iteritems(obj)):
|
|
||||||
check_key(key)
|
|
||||||
self.computeOffsets(key, asReference=True)
|
|
||||||
self.computeOffsets(value, asReference=True)
|
|
||||||
@@ -714,7 +714,7 @@
|
|
||||||
keys = []
|
|
||||||
values = []
|
|
||||||
objectsToWrite = []
|
|
||||||
- for key, value in iteritems(obj):
|
|
||||||
+ for key, value in sorted(iteritems(obj)):
|
|
||||||
keys.append(key)
|
|
||||||
values.append(value)
|
|
||||||
for key in keys:
|
|
Loading…
Reference in a new issue