Merge branch 'pr/181'

quantopian · Nov 9, 2015 · 7589050 · 7589050
2 parents 95f319c + 17c8000
commit 7589050
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
   - conda info -a
 
 install:
-  - conda create -q -n testenv --yes python=$TRAVIS_PYTHON_VERSION ipython pyzmq numpy scipy nose matplotlib pandas Cython patsy statsmodels flake8 scikit-learn seaborn runipy pytables networkx
+  - conda create -q -n testenv --yes python=$TRAVIS_PYTHON_VERSION ipython pyzmq numpy scipy nose matplotlib pandas Cython patsy statsmodels flake8 scikit-learn seaborn runipy pytables networkx pandas-datareader
   - source activate testenv
   - pip install nose_parameterized contextlib2 logbook==0.10.1
   - pip install --no-deps git+https://github.com/quantopian/zipline

diff --git a/pyfolio/utils.py b/pyfolio/utils.py
@@ -26,7 +26,9 @@
 
 import pandas as pd
 import numpy as np
-import pandas.io.data as web
+
+from pandas_datareader import data as web
+
 from pandas.tseries.offsets import BDay
 
 import zipfile

diff --git a/setup.py b/setup.py
@@ -48,7 +48,9 @@
     'scikit-learn>=0.15.0',
     'scipy>=0.14.0',
     'seaborn>=0.6.0',
-    'statsmodels>=0.5.0']
+    'statsmodels>=0.5.0',
+    'pandas-datareader>=0.2',
+]
 
 extras_reqs = {
     'bayesian': ['pymc3']