Skip to content

Commit 039c57d

Browse files
committed
Merge pull request #6089 from jreback/apply_warn
DOC: remove warnings in panel.apply docs (GH6087)
2 parents 07e9e20 + 12142b6 commit 039c57d

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

doc/source/basics.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ fact, this expression is False:
287287
(df+df == df*2).all()
288288
289289
Notice that the boolean DataFrame ``df+df == df*2`` contains some False values!
290-
That is because NaNs do not compare as equals:
290+
That is because NaNs do not compare as equals:
291291

292292
.. ipython:: python
293293
@@ -727,7 +727,7 @@ Apply can also accept multiple axes in the ``axis`` argument. This will pass a
727727

728728
.. ipython:: python
729729
730-
f = lambda x: (x-x.mean(1)/x.std(1))
730+
f = lambda x: ((x.T-x.mean(1))/x.std(1)).T
731731
732732
result = panel.apply(f, axis = ['items','major_axis'])
733733
result

doc/source/v0.13.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Enhancements
134134

135135
.. ipython:: python
136136

137-
f = lambda x: (x-x.mean(1)/x.std(1))
137+
f = lambda x: ((x.T-x.mean(1))/x.std(1)).T
138138

139139
result = panel.apply(f, axis = ['items','major_axis'])
140140
result

pandas/io/tests/test_data.py

+6
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,16 @@ def test_get_quote_stringlist(self):
150150

151151
@network
152152
def test_get_components_dow_jones(self):
153+
raise nose.SkipTest('unreliable test, receive partial components back for dow_jones')
154+
153155
df = web.get_components_yahoo('^DJI') #Dow Jones
154156
assert isinstance(df, pd.DataFrame)
155157
self.assertEqual(len(df), 30)
156158

157159
@network
158160
def test_get_components_dax(self):
161+
raise nose.SkipTest('unreliable test, receive partial components back for dax')
162+
159163
df = web.get_components_yahoo('^GDAXI') #DAX
160164
assert isinstance(df, pd.DataFrame)
161165
self.assertEqual(len(df), 30)
@@ -166,6 +170,8 @@ def test_get_components_dax(self):
166170
def test_get_components_nasdaq_100(self):
167171
"""as of 7/12/13 the conditional will test false because the link is
168172
invalid"""
173+
raise nose.SkipTest('unreliable test, receive partial components back for nasdaq_100')
174+
169175
df = web.get_components_yahoo('^NDX') #NASDAQ-100
170176
assert isinstance(df, pd.DataFrame)
171177

pandas/tests/test_panel.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -1146,11 +1146,13 @@ def test_apply_slabs(self):
11461146
assert_frame_equal(result,expected)
11471147

11481148
# transforms
1149-
f = lambda x: (x-x.mean(1)/x.std(1))
1149+
f = lambda x: ((x.T-x.mean(1))/x.std(1)).T
11501150

1151-
result = self.panel.apply(f, axis = ['items','major_axis'])
1152-
expected = Panel(dict([ (ax,f(self.panel.loc[:,:,ax])) for ax in self.panel.minor_axis ]))
1153-
assert_panel_equal(result,expected)
1151+
# make sure that we don't trigger any warnings
1152+
with tm.assert_produces_warning(False):
1153+
result = self.panel.apply(f, axis = ['items','major_axis'])
1154+
expected = Panel(dict([ (ax,f(self.panel.loc[:,:,ax])) for ax in self.panel.minor_axis ]))
1155+
assert_panel_equal(result,expected)
11541156

11551157
result = self.panel.apply(f, axis = ['major_axis','minor_axis'])
11561158
expected = Panel(dict([ (ax,f(self.panel.loc[ax])) for ax in self.panel.items ]))

0 commit comments

Comments
 (0)