Skip to content

Commit eb2b8bc

Browse files
committed
Revert "Merge pull request pandas-dev#5058 from neurodebian/master"
Was mistakenly incorporated as a fix, when in reality it was a missing skip test. This reverts commit fd3acfd, reversing changes made to ec54354.
1 parent 97b7e7f commit eb2b8bc

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

pandas/io/tests/test_excel.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import pandas as pd
2222

2323

24-
def _skip_if_no_xlrd(version=(0, 9)):
24+
def _skip_if_no_xlrd():
2525
try:
2626
import xlrd
2727
ver = tuple(map(int, xlrd.__VERSION__.split(".")[:2]))
28-
if ver < version:
29-
raise nose.SkipTest('xlrd < %s, skipping' % str(version))
28+
if ver < (0, 9):
29+
raise nose.SkipTest('xlrd < 0.9, skipping')
3030
except ImportError:
3131
raise nose.SkipTest('xlrd not installed, skipping')
3232

@@ -350,10 +350,7 @@ def test_excelwriter_contextmanager(self):
350350
with ExcelWriter(pth) as writer:
351351
self.frame.to_excel(writer, 'Data1')
352352
self.frame2.to_excel(writer, 'Data2')
353-
# If above test passes with outdated xlrd, next test
354-
# does require fresh xlrd
355-
# http://nipy.bic.berkeley.edu/builders/pandas-py2.x-wheezy-sparc/builds/148/steps/shell_4/logs/stdio
356-
_skip_if_no_xlrd((0, 9))
353+
357354
with ExcelFile(pth) as reader:
358355
found_df = reader.parse('Data1')
359356
found_df2 = reader.parse('Data2')

0 commit comments

Comments
 (0)