Merge pull request #102 from davidastephens/test_017rc2

TST: Update tests to pandas 0.17.0rc2

Author: davidastephens

.travis.yml

@@ -7,7 +7,8 @@ env:
   - PYTHON=2.7 PANDAS=0.15.1
   - PYTHON=3.3 PANDAS=0.14.1
   - PYTHON=3.4 PANDAS=0.16.2
-  - PYTHON=3.4 PANDAS=v0.17.0rc1
+  - PYTHON=3.4 PANDAS=v0.17.0rc2
+  - PYTHON=3.5 PANDAS=v0.17.0rc2
   - PYTHON=2.7 PANDAS=0.12.0
   - PYTHON=2.7 PANDAS=0.11.0
   - PYTHON=2.7 PANDAS=0.10.1
@@ -37,8 +38,9 @@ install:
   # Useful for debugging any issues with conda
   - conda info -a
 
-  - conda create -q -n test-environment python=$PYTHON pandas=$PANDAS nose coverage setuptools html5lib lxml beautiful-soup
+  - conda create -q -n test-environment python=$PYTHON pandas=$PANDAS nose coverage setuptools html5lib lxml
   - source activate test-environment
+  - pip install beautifulsoup4
   - pip install coveralls --quiet
   - conda list
   - python setup.py install

pandas_datareader/wb.py

@@ -2,7 +2,6 @@
 
 from __future__ import print_function
 
-from distutils.version import LooseVersion
 import warnings
 
 from pandas.compat import reduce, lrange
@@ -11,7 +10,6 @@
 import pandas
 import numpy as np
 
-PD017 = LooseVersion(pandas.__version__) > LooseVersion('0.16.2')
 # This list of country codes was pulled from wikipedia during October 2014.
 # While some exceptions do exist, it is the best proxy for countries supported
 # by World Bank.  It is an aggregation of the 2-digit ISO 3166-1 alpha-2, and 
@@ -158,12 +156,7 @@ def download(country=['MX', 'CA', 'US'], indicator=['NY.GDP.MKTP.CD', 'NY.GNS.IC
         out = reduce(lambda x, y: x.merge(y, how='outer'), data)
         out = out.drop('iso_code', axis=1)
         out = out.set_index(['country', 'year'])
-        if PD017:
-            kwargs = dict((kw, True)
-                          for kw in ('datetime', 'numeric', 'timedelta'))
-        else:
-            kwargs = {'convert_numeric': True}
-        out = out.convert_objects(**kwargs)
+        out = out.convert_objects(convert_numeric=True)
         return out
     else:
         msg = "No indicators returned data."