Permalink
Browse files

REF remove la.IO.merge method

  • Loading branch information...
1 parent d9da366 commit 292bf01a72e05a39d9edcc4ab5ed03911026a1c4 @kwgoodman committed Jan 8, 2014
Showing with 2 additions and 17 deletions.
  1. +2 −0 RELEASE.rst
  2. +0 −17 la/io.py
View
@@ -28,6 +28,7 @@ la 0.7
- la now supports Python 3 (thanks to Benjamin Root for initial porting)
- Can now index into a larry with a 1d bool larry
- Added setitem ability to label indexing (lix)
+- la.IO no longer keeps the archive connection open between calls
- C files generated with Cython 0.19.1 instead of 0.15.1
**Breakage from la 0.6**
@@ -36,6 +37,7 @@ la 0.7
- deprecated lar.movingsum() removed (use faster lar.move_sum() instead)
- deprecated lar.movingrank() removed (use faster lar.move_ranking() instead)
- la.stack() now sorts labels
+- merge method of the la.IO class has been removed
**Bug fixes**
View
@@ -154,23 +154,6 @@ def clear(self):
for key in self:
self.__delitem__(key)
- def merge(self, key, lar, update=False):
- """
- Merge, or optionally update, a larry with a second larry.
-
- See larry.merge for details.
-
- Note: the entire larry is loaded from the archive, merged with `lar`
- and then the merged larry is saved back to the archive. The resize
- function of h5py is not used. In other words, this function might not
- be practical for very large larrys.
-
- """
- lar1 = self[key][:]
- lar2 = lar1.merge(lar, update=update)
- del self.f[key]
- self[key] = lar2
-
def __iter__(self):
return iter(self.keys())

0 comments on commit 292bf01

Please sign in to comment.