Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ sudo: false
language: python

env:
- PYTHON=2.6 PANDAS=0.13.1
- PYTHON=2.7 PANDAS=0.15.1
- PYTHON=3.3 PANDAS=0.14.1
- PYTHON=3.4 PANDAS=0.16.2
- PYTHON=2.6 PANDAS=0.14.1
- PYTHON=2.7 PANDAS=0.16.2
- PYTHON=3.3 PANDAS=0.15.1
- PYTHON=3.4 PANDAS=0.17.1
- PYTHON=3.5 PANDAS=0.17.1
- PYTHON=3.4 PANDAS=0.18.0
- PYTHON=3.5 PANDAS=0.18.0
- PYTHON=2.7 PANDAS=0.13.0
- PYTHON=2.7 PANDAS=0.12.0
- PYTHON=2.7 PANDAS=0.11.0
- PYTHON=2.7 PANDAS=0.10.1

matrix:
allow_failures:
- env: PYTHON=2.7 PANDAS=0.13.0
- env: PYTHON=2.7 PANDAS=0.12.0
- env: PYTHON=2.7 PANDAS=0.11.0
- env: PYTHON=2.7 PANDAS=0.10.1

install:
- pip install -qq flake8
Expand All @@ -26,9 +26,9 @@ install:
# conditionally because it saves us some downloading if the version is
# the same.
- if [[ "$PYTHON" == "2.7" ]]; then
wget http://repo.continuum.io/miniconda/Miniconda-3.4.2-Linux-x86_64.sh -O miniconda.sh;
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
else
wget http://repo.continuum.io/miniconda/Miniconda3-3.4.2-Linux-x86_64.sh -O miniconda.sh;
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
fi
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
Expand All @@ -41,7 +41,7 @@ install:
- conda create -q -n test-environment python=$PYTHON pandas=$PANDAS nose coverage setuptools html5lib lxml
- source activate test-environment
- pip install beautifulsoup4
- if [[ "$PYTHON" == "2.6" ]]; then
- if [[ "$PYTHON" == "2.6" ]]; then
pip install simplejson;
fi
- pip install coveralls --quiet
Expand Down
4 changes: 4 additions & 0 deletions pandas_datareader/tests/test_eurostat.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ def test_get_cdh_e_fos(self):
tm.assert_frame_equal(df, expected)

def test_get_sts_cobp_a(self):

raise nose.SkipTest("This raises error because of data amount, "
"should be fixed in #149")

# Building permits - annual data (2010 = 100)
df = web.DataReader('sts_cobp_a', 'eurostat',
start=pd.Timestamp('1992-01-01'),
Expand Down
3 changes: 2 additions & 1 deletion pandas_datareader/tests/test_google_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ def assert_option_result(self, df):
tm.assert_index_equal(df.columns, exp_columns)
tm.assert_equal(df.index.names, [u'Strike', u'Expiry', u'Type', u'Symbol'])

dtypes = [np.dtype(x) for x in ['float64'] * 7 + ['object', 'float64', 'datetime64[ns]']]
dtypes = ['float64'] * 6 + ['int64', 'object', 'float64', 'datetime64[ns]']
dtypes = [np.dtype(x) for x in dtypes]
tm.assert_series_equal(df.dtypes, pd.Series(dtypes, index=exp_columns))

def test_get_options_data(self):
Expand Down
75 changes: 42 additions & 33 deletions pandas_datareader/tests/test_oecd.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,48 @@ def test_get_un_den(self):
df = web.DataReader('UN_DEN', 'oecd', start=datetime(1960, 1, 1),
end=datetime(2012, 1, 1))

au = [50.17292785, 49.47181009, 49.52106174, 49.16341327, 48.19296375,
47.8863461, 45.83517292, 45.02021403, 44.78983834, 44.37794217,
44.15358142, 45.38865546, 46.33092037, 47.2343406, 48.80023876,
50.0639872, 50.23390644, 49.8214994, 49.67636585, 49.55227375,
48.48657368, 47.41179739, 47.52526561, 47.93048854, 47.26327162,
45.4617105, 43.90202112, 42.32759607, 40.35838899, 39.35157364,
39.55023059, 39.93196617, 39.21915611, 37.24341973, 34.42587311,
32.51238056, 31.16811321, 29.78802692, 28.14678656, 25.41919614,
25.71802695, 24.53149132, 23.21981032, 22.99175908, 22.29392791,
22.29118237, 20.22236361, 18.51151852, 18.5674024, 19.31219498,
18.44405734, 18.51407731, 18.19718895]
jp = [32.89493671, 33.80225989, 34.5969919, 35.01871257, 35.46869345,
35.28164117, 34.749499, 34.40573103, 34.50762389, 35.16411379,
35.10284332, 34.57209848, 34.31168831, 33.46611342, 34.26450371,
34.53099287, 33.69881466, 32.99814274, 32.59541985, 31.75696594,
31.14832536, 30.8917513, 30.56612982, 29.75285171, 29.22391559,
28.79202411, 28.18680064, 27.71454381, 26.94358748, 26.13165206,
26.13236815, 25.24310276, 24.98554405, 24.83467897, 24.7263178,
24.38077142, 23.3953401, 22.78797997, 22.52794337, 22.18157944,
21.54406273, 20.88284597, 20.26073907, 19.73945642, 19.06442577,
18.79844243, 18.3497807, 18.25095057, 18.2204924, 18.45787546,
18.38733297, 18.99504195, 17.97238372]
us = [30.89748411, 29.51891217, 29.34276869, 28.51337535, 28.30646144,
28.16661991, 28.19557735, 27.76578899, 27.9004622, 27.30836054,
27.43402867, 26.94941363, 26.25996487, 25.83134349, 25.74427582,
25.28771204, 24.38412814, 23.59186681, 23.94328194, 22.3651229,
22.06009466, 21.01328205, 20.47463895, 19.45290876, 18.22953818,
17.44855678, 17.00126975, 16.5162476, 16.24744487, 15.86401127,
15.45147174, 15.46986912, 15.1499578, 15.13654544, 14.91544059,
14.31762091, 14.02052225, 13.55213736, 13.39571457, 13.36670812,
12.90865079, 12.86997731, 12.76906383, 12.39142968, 12.02130767,
11.96023574, 11.48458378, 11.56435375, 11.91022276, 11.79401904,
11.38345975, 11.32948829, 11.07884758]
au = [50.17292785, 49.47181009, 49.52106174, 49.16341327,
48.19296375, 47.8863461, 45.83517292, 45.02021403,
44.78983834, 44.37794217, 44.15358142, 45.38865546,
46.33092037, 47.2343406, 48.80023876, 50.0639872,
50.23390644, 49.8214994, 49.67636585, 49.55227375,
48.48657368, 47.41179739, 47.52526561, 47.93048854,
47.26327162, 45.4617105, 43.90202112, 42.32759607,
40.35838899, 39.35157364, 39.55023059, 39.93212859,
39.21948472, 37.24343693, 34.42549573, 32.51172639,
31.16809569, 29.78835077, 28.14657769, 25.41970706,
25.71752984, 24.53108811, 23.21936888, 22.99140633,
22.29380238, 22.29160819, 20.22236326, 18.51151852,
18.56792804, 19.31219498, 18.44405734, 18.51105048,
18.19718895]
jp = [32.32911392, 33.73688458, 34.5969919, 35.01871257,
35.46869345, 35.28164117, 34.749499, 34.40573103,
34.50762389, 35.16411379, 35.10284332, 34.57209848,
34.31168831, 33.46611342, 34.26450371, 34.53099287,
33.69881466, 32.99814274, 32.59541985, 31.75696594,
31.14832536, 30.8917513, 30.56612982, 29.75285171,
29.22391559, 28.79202411, 28.18680064, 27.71454381,
26.94358748, 26.13165206, 25.36711479, 24.78408637,
24.49892557, 24.34256055, 24.25324675, 23.96731902,
23.3953401, 22.78797997, 22.52794337, 22.18157944,
21.54406273, 20.88284597, 20.26073907, 19.73945642,
19.25116713, 18.79844243, 18.3497807, 18.25095057,
18.2204924, 18.45787546, 18.40380743, 18.99504195,
17.97238372]
us = [30.89748411, 29.51891217, 29.34276869, 28.51337535,
28.30646144, 28.16661991, 28.19557735, 27.76578899,
27.9004622, 27.30836054, 27.43402867, 26.94941363,
26.25996487, 25.83134349, 25.74427582, 25.28771204,
24.38412814, 23.59186681, 23.94328194, 22.36400776,
22.06009466, 21.01328205, 20.47463895, 19.45290876,
18.22953818, 17.44855678, 17.00126975, 16.5162476,
16.24744487, 15.86401127, 15.45147174, 15.46986912,
15.1499578, 15.13654544, 14.91544059, 14.31762091,
14.02052225, 13.55213736, 13.39571457, 13.36670812,
12.84874656, 12.85719022, 12.63753733, 12.39142968,
12.02130767, 11.96023574, 11.48458378, 11.56435375,
11.91022276, 11.79401904, 11.38345975, 11.32948829,
10.81535229]

index = pd.date_range('1960-01-01', '2012-01-01', freq='AS',
name='Time')
Expand Down