Skip to content

Commit 12c2523

Browse files
author
Kevin Sheppard
committed
TST: Update travis
Remove unnecesary sudo so testign will use containers Update pandas testing version to include 0.16
1 parent a601bb7 commit 12c2523

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
sudo: false
2+
13
language: python
24

35
env:
46
- PYTHON=2.6 PANDAS=0.13.1
57
- PYTHON=2.7 PANDAS=0.15.1
68
- PYTHON=3.3 PANDAS=0.14.1
7-
- PYTHON=3.4 PANDAS=0.15.1
9+
- PYTHON=3.4 PANDAS=0.16.2
810
- PYTHON=2.7 PANDAS=0.12.0
911
- PYTHON=2.7 PANDAS=0.11.0
1012
- PYTHON=2.7 PANDAS=0.10.1
@@ -16,7 +18,6 @@ matrix:
1618
- env: PYTHON=2.7 PANDAS=0.10.1
1719

1820
install:
19-
- sudo apt-get update
2021
# You may want to periodically update this, although the conda update
2122
# conda line below will keep everything up-to-date. We do this
2223
# conditionally because it saves us some downloading if the version is

pandas_datareader/wb.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
from __future__ import print_function
44

5-
from distutils.version import LooseVersion
6-
75
from pandas.compat import map, reduce, range, lrange
86
from pandas.io.common import urlopen
97
from pandas.io import json
108
import pandas
119
import numpy as np
1210
import warnings
1311

14-
PD017 = LooseVersion(pandas.__version__) >= LooseVersion('0.16.2')
1512
# This list of country codes was pulled from wikipedia during October 2014.
1613
# While some exceptions do exist, it is the best proxy for countries supported
1714
# by World Bank. It is an aggregation of the 2-digit ISO 3166-1 alpha-2, and
@@ -158,8 +155,7 @@ def download(country=['MX', 'CA', 'US'], indicator=['NY.GDP.MKTP.CD', 'NY.GNS.IC
158155
out = reduce(lambda x, y: x.merge(y, how='outer'), data)
159156
out = out.drop('iso_code', axis=1)
160157
out = out.set_index(['country', 'year'])
161-
kw = 'numeric' if PD017 else 'convert_numeric'
162-
out = out.convert_objects(**{kw: True})
158+
out = out.convert_objects(convert_numeric=True)
163159
return out
164160
else:
165161
msg = "No indicators returned data."

0 commit comments

Comments
 (0)