iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement rolling api introduced in pandas 0.18 (#5328) 

* Implement new rolling api introduced in pandas 0.18

* Bump pandas to 0.23.1

* Add 0.18 requirement in setup.py

* Require >=0.18.0, not just 0.18
This commit is contained in:
Ville Brofeldt 2018-07-05 00:04:57 +02:00 committed by Maxime Beauchemin
parent 059b64dad7
commit 6fee0587ee
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -19,7 +19,7 @@ gunicorn==19.8.0
humanize==0.5.1
idna==2.6
markdown==2.6.11
pandas==0.22.0
pandas==0.23.1
parsedatetime==2.0.0
pathlib2==2.3.0
polyline==1.3.2

2
setup.py
View File

@ -76,7 +76,7 @@ setup(
'humanize',
'idna',
'markdown',
'pandas',
'pandas>=0.18.0',
'parsedatetime',
'pathlib2',
'polyline',

7
superset/viz.py
View File

@ -1175,15 +1175,14 @@ class NVD3TimeSeriesViz(NVD3Viz):
if rolling_type in ('mean', 'std', 'sum') and rolling_periods:
kwargs = dict(
arg=df,
window=rolling_periods,
min_periods=min_periods)
if rolling_type == 'mean':
df = pd.rolling_mean(**kwargs)
df = df.rolling(**kwargs).mean()
elif rolling_type == 'std':
df = pd.rolling_std(**kwargs)
df = df.rolling(**kwargs).std()
elif rolling_type == 'sum':
df = pd.rolling_sum(**kwargs)
df = df.rolling(**kwargs).sum()
elif rolling_type == 'cumsum':
df = df.cumsum()
if min_periods: