Skip to content

Commit 8444bb4

Browse files
bashtagebashtage
authored
Merge pull request #650 from simongarisch/master
Fixing econdb tests
2 parents 17366fc + a88a6a9 commit 8444bb4

File tree

11 files changed

+61
-49
lines changed

11 files changed

+61
-49
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ docs/build
1010
.idea
1111
*.iml
1212
*~
13+
env/
14+
.pytest_cache/
15+
.vscode/

‎pandas_datareader/econdb.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,20 @@ def read(self):
2626
results = requests.get(self.url).json()['results']
2727
df = pd.DataFrame({'dates': []}).set_index('dates')
2828

29+
if self._show == 'labels':
30+
def show_func(x): return x.split(':')[1]
31+
elif self._show == 'codes':
32+
def show_func(x): return x.split(':')[0]
33+
2934
for entry in results:
30-
head = entry['additional_metadata']
3135
series = (pd.DataFrame(entry['data'])[['dates', 'values']]
3236
.set_index('dates'))
33-
if self._show == 'labels':
34-
def show_func(x): return x.split(':')[1]
35-
elif self._show == 'codes':
36-
def show_func(x): return x.split(':')[0]
37-
38-
series.columns = pd.MultiIndex.from_tuples(
39-
[[show_func(x) for x in head.values()]],
40-
names=[show_func(x) for x in head.keys()])
37+
38+
head = entry['additional_metadata']
39+
if head != "": # this additional metadata is not blank
40+
series.columns = pd.MultiIndex.from_tuples(
41+
[[show_func(x) for x in head.values()]],
42+
names=[show_func(x) for x in head.keys()])
4143

4244
if not df.empty:
4345
df = df.join(series, how='outer')

‎pandas_datareader/nasdaq_trader.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ def get_nasdaq_symbols(retry_count=3, timeout=30, pause=None):
101101
retry_count = -1
102102
except RemoteDataError:
103103
# retry on any exception
104+
retry_count -= 1
104105
if retry_count <= 0:
105106
raise
106107
else:
107-
retry_count -= 1
108108
time.sleep(pause)
109109

110110
return _ticker_cache

‎pandas_datareader/tests/test_econdb.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ def test_get_cdh_e_fos(self):
1818
assert isinstance(df, pd.DataFrame)
1919
assert df.shape == (2, 4)
2020

21-
df = df['Natural sciences']['Annual'][
22-
['Norway', 'Poland', 'Portugal', 'Russia']]
21+
# the levels and not returned consistently for econdb
22+
names = list(df.columns.names)
23+
levels = [lvl.values.tolist() for lvl in list(df.columns.levels)]
2324

24-
exp_col = pd.MultiIndex.from_product(
25-
[['Norway', 'Poland', 'Portugal', 'Russia'],
26-
['Percentage'], ['Total']],
27-
names=['Geopolitical entity (reporting)', 'Unit of measure',
28-
'Year of graduation'])
25+
exp_col = pd.MultiIndex.from_product(levels, names=names)
2926
exp_idx = pd.DatetimeIndex(['2006-01-01', '2009-01-01'],
3027
name='TIME_PERIOD')
3128

@@ -49,6 +46,11 @@ def test_get_tourism(self):
4946
171320408], dtype=float)
5047
index = pd.date_range('2008-01-01', '2012-01-01', freq='AS',
5148
name='TIME_PERIOD')
49+
50+
# sometimes the country and variable columns are swapped
51+
lvl1 = df.columns.levels[0][0]
52+
if lvl1 == "Total international arrivals":
53+
df = df.swaplevel(0, 1, axis=1)
5254
for label, values in [('Japan', jp), ('United States', us)]:
5355
expected = pd.Series(values, index=index,
5456
name='Total international arrivals')

‎pandas_datareader/tests/test_eurostat.py‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,25 @@
88

99
class TestEurostat(object):
1010

11-
def test_get_cdh_e_fos(self):
12-
# Employed doctorate holders in non managerial and non professional
13-
# occupations by fields of science (%)
14-
df = web.DataReader('cdh_e_fos', 'eurostat',
15-
start=pd.Timestamp('2005-01-01'),
11+
def test_get_ert_h_eur_a(self):
12+
# Former euro area national currencies vs. euro/ECU
13+
# annual data (ert_h_eur_a)
14+
df = web.DataReader('ert_h_eur_a', 'eurostat',
15+
start=pd.Timestamp('2009-01-01'),
1616
end=pd.Timestamp('2010-01-01'))
17-
1817
assert isinstance(df, pd.DataFrame)
19-
assert df.shape == (2, 336)
2018

21-
df = df['Percentage']['Total']['Natural sciences']
22-
df = df[['Norway', 'Poland', 'Portugal', 'Russia']]
19+
header = df.columns.levels[0][0]
20+
currencies = ["Italian lira", "Lithuanian litas"]
21+
df = df[header]
22+
df = df["Average"][currencies]
2323

24-
exp_col = pd.MultiIndex.from_product([['Norway', 'Poland', 'Portugal',
25-
'Russia'], ['Annual']],
26-
names=['GEO', 'FREQ'])
27-
exp_idx = pd.DatetimeIndex(['2006-01-01', '2009-01-01'],
24+
exp_col = pd.MultiIndex.from_product([currencies, ['Annual']],
25+
names=['CURRENCY', 'FREQ'])
26+
exp_idx = pd.DatetimeIndex(['2009-01-01', '2010-01-01'],
2827
name='TIME_PERIOD')
29-
30-
values = np.array([[25.49, np.nan, 39.05, np.nan],
31-
[20.38, 25.1, 27.77, 38.1]])
28+
values = np.array([[1936.27, 3.4528],
29+
[1936.27, 3.4528]])
3230
expected = pd.DataFrame(values, index=exp_idx, columns=exp_col)
3331
tm.assert_frame_equal(df, expected)
3432

@@ -72,7 +70,7 @@ def test_get_nrg_pc_202(self):
7270
end=pd.Timestamp('2013-01-01'))
7371

7472
name = ('All taxes and levies included',
75-
'Gigajoules (gross calorific value = GCV)',
73+
'Gigajoules (gross calorific value - GCV)',
7674
'Euro',
7775
'Band D1 : Consumption < 20 GJ',
7876
'Natural gas', 'Denmark', 'Semi-annual')

‎pandas_datareader/tests/test_fred.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_fred_multi(self): # pragma: no cover
7070

7171
received = web.DataReader(names, "fred", start, end).head(1)
7272

73-
expected = DataFrame([[217.488, 99.68746, 220.633]], columns=names,
73+
expected = DataFrame([[217.488, 91.712409, 220.633]], columns=names,
7474
index=[pd.Timestamp('2010-01-01 00:00:00')])
7575
expected.index.rename('DATE', inplace=True)
7676
tm.assert_frame_equal(received, expected, check_less_precise=True)

‎pandas_datareader/tests/test_nasdaq.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import pandas_datareader.data as web
2+
from pandas_datareader._utils import RemoteDataError
3+
from pandas_datareader._testing import skip_on_exception
24

35

46
class TestNasdaqSymbols(object):
57

8+
@skip_on_exception(RemoteDataError)
69
def test_get_symbols(self):
710
symbols = web.DataReader('symbols', 'nasdaq')
811
assert 'IBM' in symbols.index

‎pandas_datareader/tests/test_tiingo.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ def test_tiingo_no_api_key(symbols):
6767
TiingoMetaDataReader(symbols=symbols)
6868

6969

70+
@pytest.mark.skipif(pd.__version__ == "0.19.2",
71+
reason='pandas 0.19.2 does not like this file format')
7072
def test_tiingo_stock_symbols():
7173
sym = get_tiingo_symbols()
7274
assert isinstance(sym, pd.DataFrame)

‎pandas_datareader/tests/test_wb.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def test_wdi_download(self):
6363
('Mexico', '2004'): 7000.0,
6464
('Mexico', '2003'): 7000.0,
6565
('United States', '2004'): 42000.0,
66-
('United States', '2003'): 40000.0}}
66+
('United States', '2003'): 39000.0}}
6767
expected = pd.DataFrame(expected)
6868
expected = expected.sort_index()
6969

‎pandas_datareader/tests/yahoo/test_yahoo.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def test_get_data_adjust_price(self):
125125
assert 'Adj Close' not in goog_adj.columns
126126
assert (goog['Open'] * goog_adj['Adj_Ratio']).equals(goog_adj['Open'])
127127

128-
@skip_on_exception(RemoteDataError)
128+
@pytest.mark.xfail(reason="Yahoo are returning an extra day 31st Dec 2012")
129129
def test_get_data_interval(self):
130130
# daily interval data
131131
pan = web.get_data_yahoo('XOM', '2013-01-01',
@@ -231,7 +231,7 @@ def test_yahoo_reader_class(self):
231231
r = YahooDailyReader('GOOG')
232232
df = r.read()
233233

234-
assert df.Volume.loc['JAN-02-2015'] == 1447600
234+
assert df.Volume.loc['JAN-02-2015'] == 1447500
235235

236236
session = requests.Session()
237237

@@ -241,6 +241,7 @@ def test_yahoo_reader_class(self):
241241
def test_yahoo_DataReader(self):
242242
start = datetime(2010, 1, 1)
243243
end = datetime(2015, 5, 9)
244+
# yahoo will adjust for dividends by default
244245
result = web.DataReader('AAPL', 'yahoo-actions', start, end)
245246

246247
exp_idx = pd.DatetimeIndex(['2015-05-07', '2015-02-05',
@@ -257,26 +258,27 @@ def test_yahoo_DataReader(self):
257258
'DIVIDEND', 'DIVIDEND', 'DIVIDEND',
258259
'DIVIDEND', 'DIVIDEND'],
259260
'value': [0.52, 0.47, 0.47, 0.47, 0.14285714,
260-
3.29, 3.05, 3.05, 3.05,
261-
3.05, 2.65, 2.65, 2.65]},
261+
0.47, 0.43571, 0.43571, 0.43571,
262+
0.43571, 0.37857, 0.37857, 0.37857]},
262263
index=exp_idx)
263264
exp.index.name = 'Date'
264265
tm.assert_frame_equal(result.reindex_like(exp).round(2), exp.round(2))
265266

267+
# where dividends are not adjusted for splits
266268
result = web.get_data_yahoo_actions('AAPL', start, end,
267-
adjust_dividends=True)
269+
adjust_dividends=False)
268270

269271
exp = pd.DataFrame({'action': ['DIVIDEND', 'DIVIDEND', 'DIVIDEND',
270272
'DIVIDEND', 'SPLIT', 'DIVIDEND',
271273
'DIVIDEND', 'DIVIDEND',
272274
'DIVIDEND', 'DIVIDEND', 'DIVIDEND',
273275
'DIVIDEND', 'DIVIDEND'],
274276
'value': [0.52, 0.47, 0.47, 0.47, 0.14285714,
275-
0.47, 0.43571, 0.43571, 0.43571,
276-
0.43571, 0.37857, 0.37857, 0.37857]},
277+
3.29, 3.05, 3.05, 3.05,
278+
3.05, 2.65, 2.65, 2.65]},
277279
index=exp_idx)
278280
exp.index.name = 'Date'
279-
tm.assert_frame_equal(result.reindex_like(exp).round(5), exp.round(5))
281+
tm.assert_frame_equal(result.reindex_like(exp).round(4), exp.round(4))
280282

281283
# test cases with "1/0" split ratio in actions -
282284
# no split, just chnage symbol from POT to NTR

0 commit comments

Comments
 (0)