Skip to content

Commit

Permalink
Address merge comments
Browse files Browse the repository at this point in the history
  • Loading branch information
kprestel committed Nov 11, 2018
1 parent 62e0dde commit 61dcee3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
16 changes: 4 additions & 12 deletions pandas/core/groupby/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -1755,12 +1755,8 @@ def cummin(self, axis=0, **kwargs):
if axis != 0:
return self.apply(lambda x: np.minimum.accumulate(x, axis))

if kwargs.get('numeric_only') or False:
numeric_only = kwargs.get('numeric_only')
else:
numeric_only = False

return self._cython_transform('cummin', numeric_only=numeric_only)
return self._cython_transform('cummin',
numeric_only=kwargs.get('numeric_only') or False)

@Substitution(name='groupby')
@Appender(_doc_template)
Expand All @@ -1769,12 +1765,8 @@ def cummax(self, axis=0, **kwargs):
if axis != 0:
return self.apply(lambda x: np.maximum.accumulate(x, axis))

if kwargs:
numeric_only = kwargs.get('numeric_only')
else:
numeric_only = False

return self._cython_transform('cummax', numeric_only=numeric_only)
return self._cython_transform('cummax',
numeric_only=kwargs.get('numeric_only') or False)

def _get_cythonized_result(self, how, grouper, aggregate=False,
cython_dtype=None, needs_values=False,
Expand Down
3 changes: 2 additions & 1 deletion pandas/io/pytables.py
Original file line number Diff line number Diff line change
Expand Up @@ -3971,7 +3971,8 @@ def write(self, obj, axes=None, append=False, complib=None,

# create the axes
self.create_axes(axes=axes, obj=obj, validate=append,
min_itemsize=min_itemsize, **kwargs)
min_itemsize=min_itemsize,
**kwargs)

for a in self.axes:
a.validate(self, append)
Expand Down

0 comments on commit 61dcee3

Please sign in to comment.