Skip to content

Commit 1a50ca7

Browse files
authored
Merge pull request #204 from sinhrks/test_fix
TST: Fix broken tests
2 parents bef12f4 + ff4d8f0 commit 1a50ca7

File tree

4 files changed

+58
-44
lines changed

4 files changed

+58
-44
lines changed

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ sudo: false
33
language: python
44

55
env:
6-
- PYTHON=2.6 PANDAS=0.13.1
7-
- PYTHON=2.7 PANDAS=0.15.1
8-
- PYTHON=3.3 PANDAS=0.14.1
9-
- PYTHON=3.4 PANDAS=0.16.2
6+
- PYTHON=2.6 PANDAS=0.14.1
7+
- PYTHON=2.7 PANDAS=0.16.2
8+
- PYTHON=3.3 PANDAS=0.15.1
109
- PYTHON=3.4 PANDAS=0.17.1
11-
- PYTHON=3.5 PANDAS=0.17.1
10+
- PYTHON=3.4 PANDAS=0.18.0
11+
- PYTHON=3.5 PANDAS=0.18.0
12+
- PYTHON=2.7 PANDAS=0.13.0
1213
- PYTHON=2.7 PANDAS=0.12.0
1314
- PYTHON=2.7 PANDAS=0.11.0
14-
- PYTHON=2.7 PANDAS=0.10.1
1515

1616
matrix:
1717
allow_failures:
18+
- env: PYTHON=2.7 PANDAS=0.13.0
1819
- env: PYTHON=2.7 PANDAS=0.12.0
1920
- env: PYTHON=2.7 PANDAS=0.11.0
20-
- env: PYTHON=2.7 PANDAS=0.10.1
2121

2222
install:
2323
- pip install -qq flake8
@@ -26,9 +26,9 @@ install:
2626
# conditionally because it saves us some downloading if the version is
2727
# the same.
2828
- if [[ "$PYTHON" == "2.7" ]]; then
29-
wget http://repo.continuum.io/miniconda/Miniconda-3.4.2-Linux-x86_64.sh -O miniconda.sh;
29+
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
3030
else
31-
wget http://repo.continuum.io/miniconda/Miniconda3-3.4.2-Linux-x86_64.sh -O miniconda.sh;
31+
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
3232
fi
3333
- bash miniconda.sh -b -p $HOME/miniconda
3434
- export PATH="$HOME/miniconda/bin:$PATH"
@@ -41,7 +41,7 @@ install:
4141
- conda create -q -n test-environment python=$PYTHON pandas=$PANDAS nose coverage setuptools html5lib lxml
4242
- source activate test-environment
4343
- pip install beautifulsoup4
44-
- if [[ "$PYTHON" == "2.6" ]]; then
44+
- if [[ "$PYTHON" == "2.6" ]]; then
4545
pip install simplejson;
4646
fi
4747
- pip install coveralls --quiet

pandas_datareader/tests/test_eurostat.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ def test_get_cdh_e_fos(self):
4040
tm.assert_frame_equal(df, expected)
4141

4242
def test_get_sts_cobp_a(self):
43+
44+
raise nose.SkipTest("This raises error because of data amount, "
45+
"should be fixed in #149")
46+
4347
# Building permits - annual data (2010 = 100)
4448
df = web.DataReader('sts_cobp_a', 'eurostat',
4549
start=pd.Timestamp('1992-01-01'),

pandas_datareader/tests/test_google_options.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ def assert_option_result(self, df):
2929
tm.assert_index_equal(df.columns, exp_columns)
3030
tm.assert_equal(df.index.names, [u'Strike', u'Expiry', u'Type', u'Symbol'])
3131

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

3536
def test_get_options_data(self):

pandas_datareader/tests/test_oecd.py

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,48 @@ def test_get_un_den(self):
1414
df = web.DataReader('UN_DEN', 'oecd', start=datetime(1960, 1, 1),
1515
end=datetime(2012, 1, 1))
1616

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

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

0 commit comments

Comments
 (0)