Skip to content

Commit 620fa19

Browse files
committed
Cleaned up parametrization and xlrd min skips
1 parent 952ce86 commit 620fa19

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

pandas/tests/io/test_excel.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ def ignore_xlrd_time_clock_warning():
5151
yield
5252

5353

54-
@td.skip_if_no('xlrd', '1.0.0')
55-
class ReadingTestsBase:
54+
@td.skip_if_no('xlrd')
55+
@pytest.mark.parametrize("ext", ['.xls', '.xlsx', '.xlsm'])
56+
class TestReaders:
5657
# This is based on ExcelWriterBase
5758

5859
@pytest.fixture(autouse=True, params=['xlrd', None])
@@ -837,7 +838,7 @@ def test_read_excel_squeeze(self, ext):
837838
tm.assert_series_equal(actual, expected)
838839

839840

840-
@td.skip_if_no('xlrd', '1.0.0')
841+
@td.skip_if_no('xlrd')
841842
@pytest.mark.parametrize("ext", ['.xls', '.xlsx', '.xlsm'])
842843
class TestRoundTrip:
843844

@@ -1038,9 +1039,9 @@ def test_read_excel_parse_dates(self, ext):
10381039
tm.assert_frame_equal(df, res)
10391040

10401041

1041-
@td.skip_if_no('xlrd', '1.0.0')
1042+
@td.skip_if_no('xlrd')
10421043
@pytest.mark.parametrize("ext", ['.xls', '.xlsx', '.xlsm'])
1043-
class TestXlrdReader(ReadingTestsBase):
1044+
class TestXlrdReader:
10441045
"""
10451046
This is the base class for the xlrd tests, and 3 different file formats
10461047
are supported: xls, xlsx, xlsm

0 commit comments

Comments
 (0)