diff --git a/dama/core/gridarray.py b/dama/core/gridarray.py index 84649a9..a6184c6 100644 --- a/dama/core/gridarray.py +++ b/dama/core/gridarray.py @@ -176,7 +176,7 @@ def __getitem__(self, item, *args): raise IndexError('No variable %s in DataSet' % item) if isinstance(item, dm.GridArray): - if item.dtype == np.bool: + if item.dtype == bool: mask = np.logical_and(~self.mask, ~np.asarray(item)) new_item = dm.GridArray(np.asarray(self), grid=self.grid) new_item.mask = mask @@ -235,7 +235,7 @@ def array_shape(self): def __setitem__(self, item, val): if isinstance(item, dm.GridArray): - if item.dtype == np.bool: + if item.dtype == bool: mask = np.logical_and(~self.mask, ~np.asarray(item)) if np.isscalar(val): self[item].data[mask] = val diff --git a/dama/core/griddata.py b/dama/core/griddata.py index 8a4e19b..208c39d 100644 --- a/dama/core/griddata.py +++ b/dama/core/griddata.py @@ -87,7 +87,7 @@ def __getitem__(self, item): # mask if isinstance(item, dm.GridArray): - if item.dtype == np.bool: + if item.dtype == bool: # in this case it is a mask # ToDo: masked operations behave strangely, operations are applyed to all elements, even if masked new_data = dm.GridData(self._grid) diff --git a/dama/plotting/stat_plot.py b/dama/plotting/stat_plot.py old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py index f2e8dc5..9d96a06 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name='dama', - version='0.4.6', + version='0.4.8', packages=find_packages(), license='Apache 2.0', author='Philipp Eller',