[Notes] [Git][BuildStream/buildstream][danielsilverstone-ct/other-roaring] loadelement.py: Switch from roaringbitmap to pyroaring

[Daniel Silverstone <gitlab mg gitlab com>]

Title: GitLab

Daniel Silverstone pushed to branch danielsilverstone-ct/other-roaring at BuildStream / buildstream

Commits:

• ce0c7366
  by Daniel Silverstone at 2019-02-06T13:52:21Z

  loadelement.py: Switch from roaringbitmap to pyroaring
  
  The licence for roaringbitmap was not compatible.  pyroaring is
  a similar project which is MIT licensed and is slightly better on
  memory too.
  
  Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>
  

3 changed files:

• buildstream/_loader/loadelement.py
• requirements/requirements.in
• requirements/requirements.txt

Changes:

buildstream/_loader/loadelement.py

---

...	...	@@ -21,7 +21,7 @@
21	21	from collections.abc import Mapping
22	22	from itertools import count
23	23
24		-from roaringbitmap import RoaringBitmap, ImmutableRoaringBitmap # pylint: disable=no-name-in-module
	24	+from pyroaring import BitMap, FrozenBitMap # pylint: disable=no-name-in-module
25	25
26	26	# BuildStream toplevel imports
27	27	from .._exceptions import LoadError, LoadErrorReason
...	...	@@ -123,7 +123,7 @@ class LoadElement():
123	123	if self._dep_cache:
124	124	return
125	125
126		- self._dep_cache = RoaringBitmap()
	126	+ self._dep_cache = BitMap()
127	127
128	128	for dep in self.dependencies:
129	129	elt = dep.element
...	...	@@ -137,7 +137,7 @@ class LoadElement():
137	137	# And we depend on everything this element depends on
138	138	self._dep_cache.update(elt._dep_cache)
139	139
140		- self._dep_cache = ImmutableRoaringBitmap(self._dep_cache)
	140	+ self._dep_cache = FrozenBitMap(self._dep_cache)
141	141
142	142
143	143	# _extract_depends_from_node():

requirements/requirements.in

---

...	...	@@ -13,6 +13,4 @@ psutil
13	13	# See issues #571 and #790.
14	14	ruamel.yaml >= 0.15.41, < 0.15.52
15	15	setuptools
16		-# (Potentially) short-term need for roaring bitmaps for the
17		-# loader dependency sorting
18		-roaringbitmap
	16	+pyroaring

requirements/requirements.txt

---

...	...	@@ -13,9 +13,7 @@ psutil==5.4.8
13	13	# See issues #571 and #790.
14	14	ruamel.yaml==0.15.51
15	15	setuptools==39.0.1
16		-# (Potentially) short-term need for roaring bitmaps for the
17		-# loader dependency sorting
18		-roaringbitmap==0.6
	16	+pyroaring==0.2.6
19	17	## The following requirements were added by pip freeze:
20	18	MarkupSafe==1.1.0
21	19	six==1.12.0

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.