Skip to content

Commit

Permalink
numeric only for pandas version 2
Browse files Browse the repository at this point in the history
  • Loading branch information
chisingh committed Jul 19, 2023
1 parent 43653b1 commit 7e7fdbd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions datamations/datamation_groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ def mean(self, axis=None):
self._axis = axis
self._states.append(self)
self._operations.append('mean')
df = super(DatamationGroupBy, self).mean()
df = super(DatamationGroupBy, self).mean(numeric_only=True)
df = datamation_frame.DatamationFrame(df)
df._by = self.states[1]._by
df._states = self._states
df._operations = self._operations
self._output = df
self._axis = axis if axis else df.keys()[0]
self._error = super(DatamationGroupBy, self).std()
self._error = super(DatamationGroupBy, self).std(numeric_only=True)
for i in range(len(self._error[self._axis])):
self._error[self._axis][i] = (0 if pd.isna(self._error[self._axis][i]) else self._error[self._axis][i]) / math.sqrt(len(list(self.states[1].groups.values())[i]))
return df
Expand All @@ -61,14 +61,14 @@ def median(self, axis=None):
self._axis = axis
self._states.append(self)
self._operations.append('median')
df = super(DatamationGroupBy, self).median()
df = super(DatamationGroupBy, self).median(numeric_only=True)
df = datamation_frame.DatamationFrame(df)
df._by = self.states[1]._by
df._states = self._states
df._operations = self._operations
self._output = df
self._axis = axis if axis else df.keys()[0]
self._error = super(DatamationGroupBy, self).std()
self._error = super(DatamationGroupBy, self).std(numeric_only=True)
for i in range(len(self._error[self._axis])):
self._error[self._axis][i] = (0 if pd.isna(self._error[self._axis][i]) else self._error[self._axis][i]) / math.sqrt(len(list(self.states[1].groups.values())[i]))
return df
Expand Down Expand Up @@ -119,7 +119,7 @@ def sum(self, axis=None):
self._axis = axis
self._states.append(self)
self._operations.append('sum')
df = super(DatamationGroupBy, self).sum()
df = super(DatamationGroupBy, self).sum(numeric_only=True)
df = datamation_frame.DatamationFrame(df)
df._by = self.states[1]._by
df._states = self._states
Expand All @@ -133,7 +133,7 @@ def quantile(self, axis=None, probs=None):
self._probs = probs
self._states.append(self)
self._operations.append('quantile')
df = super(DatamationGroupBy, self).quantile(self._probs)
df = super(DatamationGroupBy, self).quantile(self._probs, numeric_only=True)
df = datamation_frame.DatamationFrame(df)
df._by = self.states[1]._by
df._states = self._states
Expand All @@ -147,7 +147,7 @@ def prod(self, axis=None):
self._axis = axis
self._states.append(self)
self._operations.append('product')
df = super(DatamationGroupBy, self).prod()
df = super(DatamationGroupBy, self).prod(numeric_only=True)
df = datamation_frame.DatamationFrame(df)
df._by = self.states[1]._by
df._states = self._states
Expand Down
2 changes: 1 addition & 1 deletion datamations/tests/test_small_salary.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

def test_small_salary(capsys):
df = small_salary().df
print(df.groupby('Work').mean())
print(df.groupby('Work').mean(numeric_only=True))
captured = capsys.readouterr()

assert "Work" in captured.out
Expand Down

0 comments on commit 7e7fdbd

Please sign in to comment.