Skip to content

Commit fe6a72a

Browse files
committed
Test: support for aggregation syntax in pandas < 0.25
1 parent 134fa3f commit fe6a72a

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

django_pandas/managers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def to_timeseries(self, fieldnames=(), verbose=True,
241241

242242
if freq is not None:
243243
if agg_kwargs is None:
244-
agg_kwargs=dict(func='mean')
244+
agg_kwargs=dict()
245245
if agg_args is None:
246246
agg_args=[]
247247
df = df.resample(freq, **rs_kwargs).agg(*agg_args, **agg_kwargs)

django_pandas/tests/test_manager.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
LongTimeSeries, PivotData, Dude, Car, Spot
99
)
1010
import pandas.util.testing as tm
11+
import semver
1112

13+
PANDAS_VERSIONINFO = semver.VersionInfo.parse(pd.__version__)
1214

1315
class DataFrameTest(TestCase):
1416

@@ -120,10 +122,16 @@ def test_longstorage(self):
120122
def test_resampling(self):
121123
qs = LongTimeSeries.objects.all()
122124
rs_kwargs = {'kind': 'period'}
123-
agg_kwargs = {'func': 'sum'}
125+
agg_args = None
126+
agg_kwargs = None
127+
if PANDAS_VERSIONINFO >= '0.25.0':
128+
agg_kwargs = {'func': 'sum'}
129+
else:
130+
agg_args= ['sum']
124131
df = qs.to_timeseries(index='date_ix', pivot_columns='series_name',
125132
values='value', storage='long',
126133
freq='M', rs_kwargs=rs_kwargs,
134+
agg_args=agg_args,
127135
agg_kwargs=agg_kwargs)
128136

129137
self.assertEqual([d.month for d in qs.dates('date_ix', 'month')],
@@ -135,7 +143,9 @@ def test_resampling(self):
135143
qs2 = WideTimeSeries.objects.all()
136144

137145
df1 = qs2.to_timeseries(index='date_ix', storage='wide',
138-
freq='M', rs_kwargs=rs_kwargs)
146+
freq='M', rs_kwargs=rs_kwargs,
147+
agg_args=agg_args,
148+
agg_kwargs = agg_kwargs)
139149

140150
self.assertEqual([d.month for d in qs.dates('date_ix', 'month')],
141151
df1.index.month.tolist())

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
tests_require=[
4343
"pandas>=0.20.1",
4444
"coverage>=4.0",
45+
"semver==2.10.1"
4546
],
4647
test_suite="runtests.runtests"
4748

0 commit comments

Comments
 (0)