Skip to content

Commit 37fce3c

Browse files
committed
TST: skip tests if xlrd has lower than needed version
1 parent d52e699 commit 37fce3c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pandas/io/tests/test_excel.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -808,11 +808,7 @@ def test_to_excel_styleconverter(self):
808808
# self.assertTrue(ws.cell(maddr).merged)
809809
# os.remove(filename)
810810
def test_excel_010_hemstring(self):
811-
try:
812-
import xlwt
813-
import openpyxl
814-
except ImportError:
815-
raise nose.SkipTest
811+
_skip_if_no_excelsuite()
816812

817813
from pandas.util.testing import makeCustomDataframe as mkdf
818814
# ensure limited functionality in 0.10

pandas/tests/test_panel.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,11 @@ def test_to_excel(self):
13811381
path = '__tmp__.' + ext
13821382
with ensure_clean(path) as path:
13831383
self.panel.to_excel(path)
1384-
reader = ExcelFile(path)
1384+
try:
1385+
reader = ExcelFile(path)
1386+
except ImportError:
1387+
raise nose.SkipTest
1388+
13851389
for item, df in self.panel.iterkv():
13861390
recdf = reader.parse(str(item), index_col=0)
13871391
assert_frame_equal(df, recdf)

0 commit comments

Comments
 (0)