Skip to content

Commit 952ce86

Browse files
committed
Replaced sparsely used frame2 fixture
1 parent e0c41f7 commit 952ce86

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

pandas/tests/io/test_excel.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ def frame(float_frame):
3232
return float_frame[:10]
3333

3434

35-
@pytest.fixture
36-
def frame2(float_frame):
37-
float_frame = float_frame.copy()
38-
float_frame.columns = ['D', 'C', 'B', 'A']
39-
return float_frame[:10]
40-
41-
4235
@pytest.fixture
4336
def tsframe():
4437
return tm.makeTimeDataFrame()[:5]
@@ -1149,9 +1142,11 @@ def test_excel_sheet_by_name_raise(self, *_):
11491142
with pytest.raises(xlrd.XLRDError):
11501143
pd.read_excel(xl, "0")
11511144

1152-
def test_excel_writer_context_manager(self, frame, frame2, *_):
1145+
def test_excel_writer_context_manager(self, frame, *_):
11531146
with ExcelWriter(self.path) as writer:
11541147
frame.to_excel(writer, "Data1")
1148+
frame2 = frame.copy()
1149+
frame2.columns = frame.columns[::-1]
11551150
frame2.to_excel(writer, "Data2")
11561151

11571152
with ExcelFile(self.path) as reader:
@@ -1318,7 +1313,7 @@ def test_sheets(self, merge_cells, engine, ext, frame, tsframe):
13181313
assert 'test1' == reader.sheet_names[0]
13191314
assert 'test2' == reader.sheet_names[1]
13201315

1321-
def test_colaliases(self, merge_cells, engine, ext, frame, frame2):
1316+
def test_colaliases(self, merge_cells, engine, ext, frame):
13221317
frame = frame.copy()
13231318
frame['A'][:5] = nan
13241319

@@ -1329,10 +1324,10 @@ def test_colaliases(self, merge_cells, engine, ext, frame, frame2):
13291324

13301325
# column aliases
13311326
col_aliases = Index(['AA', 'X', 'Y', 'Z'])
1332-
frame2.to_excel(self.path, 'test1', header=col_aliases)
1327+
frame.to_excel(self.path, 'test1', header=col_aliases)
13331328
reader = ExcelFile(self.path)
13341329
rs = pd.read_excel(reader, 'test1', index_col=0)
1335-
xp = frame2.copy()
1330+
xp = frame.copy()
13361331
xp.columns = col_aliases
13371332
tm.assert_frame_equal(xp, rs)
13381333

0 commit comments

Comments
 (0)