Skip to content

Commit 8a53402

Browse files
committed
Removed unnecessary fixture usage in Writer class
1 parent 2363698 commit 8a53402

File tree

1 file changed

+42
-43
lines changed

1 file changed

+42
-43
lines changed

pandas/tests/io/test_excel.py

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ class and any subclasses, on account of the `autouse=True`
11111111
yield
11121112
set_option(option_name, prev_engine) # Roll back option change
11131113

1114-
def test_excel_sheet_size(self, engine, ext):
1114+
def test_excel_sheet_size(self):
11151115

11161116
# GH 26080
11171117
breaking_row_count = 2**20 + 1
@@ -1143,7 +1143,7 @@ def test_excel_sheet_by_name_raise(self):
11431143
with pytest.raises(xlrd.XLRDError):
11441144
pd.read_excel(xl, "0")
11451145

1146-
def test_excel_writer_context_manager(self, frame, engine, ext):
1146+
def test_excel_writer_context_manager(self, frame):
11471147
with ExcelWriter(self.path) as writer:
11481148
frame.to_excel(writer, "Data1")
11491149
frame2 = frame.copy()
@@ -1157,7 +1157,7 @@ def test_excel_writer_context_manager(self, frame, engine, ext):
11571157
tm.assert_frame_equal(found_df, frame)
11581158
tm.assert_frame_equal(found_df2, frame2)
11591159

1160-
def test_roundtrip(self, engine, ext, frame):
1160+
def test_roundtrip(self, frame):
11611161
frame = frame.copy()
11621162
frame['A'][:5] = nan
11631163

@@ -1207,7 +1207,7 @@ def test_roundtrip(self, engine, ext, frame):
12071207
recons = pd.read_excel(self.path, index_col=0)
12081208
tm.assert_frame_equal(s.to_frame(), recons)
12091209

1210-
def test_mixed(self, engine, ext, frame):
1210+
def test_mixed(self, frame):
12111211
mixed_frame = frame.copy()
12121212
mixed_frame['foo'] = 'bar'
12131213

@@ -1216,7 +1216,7 @@ def test_mixed(self, engine, ext, frame):
12161216
recons = pd.read_excel(reader, 'test1', index_col=0)
12171217
tm.assert_frame_equal(mixed_frame, recons)
12181218

1219-
def test_ts_frame(self, tsframe, engine, ext):
1219+
def test_ts_frame(self, tsframe):
12201220
df = tsframe
12211221

12221222
df.to_excel(self.path, "test1")
@@ -1225,7 +1225,7 @@ def test_ts_frame(self, tsframe, engine, ext):
12251225
recons = pd.read_excel(reader, "test1", index_col=0)
12261226
tm.assert_frame_equal(df, recons)
12271227

1228-
def test_basics_with_nan(self, engine, ext, frame):
1228+
def test_basics_with_nan(self, frame):
12291229
frame = frame.copy()
12301230
frame['A'][:5] = nan
12311231
frame.to_excel(self.path, 'test1')
@@ -1235,7 +1235,7 @@ def test_basics_with_nan(self, engine, ext, frame):
12351235

12361236
@pytest.mark.parametrize("np_type", [
12371237
np.int8, np.int16, np.int32, np.int64])
1238-
def test_int_types(self, engine, ext, np_type):
1238+
def test_int_types(self, np_type):
12391239
# Test np.int values read come back as int
12401240
# (rather than float which is Excel's format).
12411241
df = DataFrame(np.random.randint(-10, 10, size=(10, 2)),
@@ -1261,7 +1261,7 @@ def test_int_types(self, engine, ext, np_type):
12611261

12621262
@pytest.mark.parametrize("np_type", [
12631263
np.float16, np.float32, np.float64])
1264-
def test_float_types(self, engine, ext, np_type):
1264+
def test_float_types(self, np_type):
12651265
# Test np.float values read come back as float.
12661266
df = DataFrame(np.random.random_sample(10), dtype=np_type)
12671267
df.to_excel(self.path, "test1")
@@ -1272,7 +1272,7 @@ def test_float_types(self, engine, ext, np_type):
12721272
tm.assert_frame_equal(df, recons, check_dtype=False)
12731273

12741274
@pytest.mark.parametrize("np_type", [np.bool8, np.bool_])
1275-
def test_bool_types(self, engine, ext, np_type):
1275+
def test_bool_types(self, np_type):
12761276
# Test np.bool values read come back as float.
12771277
df = (DataFrame([1, 0, True, False], dtype=np_type))
12781278
df.to_excel(self.path, "test1")
@@ -1282,7 +1282,7 @@ def test_bool_types(self, engine, ext, np_type):
12821282

12831283
tm.assert_frame_equal(df, recons)
12841284

1285-
def test_inf_roundtrip(self, engine, ext):
1285+
def test_inf_roundtrip(self):
12861286
df = DataFrame([(1, np.inf), (2, 3), (5, -np.inf)])
12871287
df.to_excel(self.path, "test1")
12881288

@@ -1291,7 +1291,7 @@ def test_inf_roundtrip(self, engine, ext):
12911291

12921292
tm.assert_frame_equal(df, recons)
12931293

1294-
def test_sheets(self, engine, ext, frame, tsframe):
1294+
def test_sheets(self, frame, tsframe):
12951295
frame = frame.copy()
12961296
frame['A'][:5] = nan
12971297

@@ -1314,7 +1314,7 @@ def test_sheets(self, engine, ext, frame, tsframe):
13141314
assert 'test1' == reader.sheet_names[0]
13151315
assert 'test2' == reader.sheet_names[1]
13161316

1317-
def test_colaliases(self, engine, ext, frame):
1317+
def test_colaliases(self, frame):
13181318
frame = frame.copy()
13191319
frame['A'][:5] = nan
13201320

@@ -1332,7 +1332,7 @@ def test_colaliases(self, engine, ext, frame):
13321332
xp.columns = col_aliases
13331333
tm.assert_frame_equal(xp, rs)
13341334

1335-
def test_roundtrip_indexlabels(self, merge_cells, engine, ext, frame):
1335+
def test_roundtrip_indexlabels(self, merge_cells, frame):
13361336
frame = frame.copy()
13371337
frame['A'][:5] = nan
13381338

@@ -1386,7 +1386,7 @@ def test_roundtrip_indexlabels(self, merge_cells, engine, ext, frame):
13861386
recons = pd.read_excel(reader, 'test1', index_col=[0, 1])
13871387
tm.assert_frame_equal(df, recons, check_less_precise=True)
13881388

1389-
def test_excel_roundtrip_indexname(self, merge_cells, engine, ext):
1389+
def test_excel_roundtrip_indexname(self, merge_cells):
13901390
df = DataFrame(np.random.randn(10, 4))
13911391
df.index.name = 'foo'
13921392

@@ -1398,7 +1398,7 @@ def test_excel_roundtrip_indexname(self, merge_cells, engine, ext):
13981398
tm.assert_frame_equal(result, df)
13991399
assert result.index.name == 'foo'
14001400

1401-
def test_excel_roundtrip_datetime(self, merge_cells, tsframe, engine, ext):
1401+
def test_excel_roundtrip_datetime(self, merge_cells, tsframe):
14021402
# datetime.date, not sure what to test here exactly
14031403
tsf = tsframe.copy()
14041404

@@ -1410,7 +1410,7 @@ def test_excel_roundtrip_datetime(self, merge_cells, tsframe, engine, ext):
14101410

14111411
tm.assert_frame_equal(tsframe, recons)
14121412

1413-
def test_excel_date_datetime_format(self, engine, ext):
1413+
def test_excel_date_datetime_format(self, ext):
14141414
# see gh-4133
14151415
#
14161416
# Excel output format strings
@@ -1449,7 +1449,7 @@ def test_excel_date_datetime_format(self, engine, ext):
14491449
# we need to use df_expected to check the result.
14501450
tm.assert_frame_equal(rs2, df_expected)
14511451

1452-
def test_to_excel_interval_no_labels(self, engine, ext):
1452+
def test_to_excel_interval_no_labels(self):
14531453
# see gh-19242
14541454
#
14551455
# Test writing Interval without labels.
@@ -1466,7 +1466,7 @@ def test_to_excel_interval_no_labels(self, engine, ext):
14661466
recons = pd.read_excel(reader, "test1", index_col=0)
14671467
tm.assert_frame_equal(expected, recons)
14681468

1469-
def test_to_excel_interval_labels(self, engine, ext):
1469+
def test_to_excel_interval_labels(self):
14701470
# see gh-19242
14711471
#
14721472
# Test writing Interval with labels.
@@ -1484,7 +1484,7 @@ def test_to_excel_interval_labels(self, engine, ext):
14841484
recons = pd.read_excel(reader, "test1", index_col=0)
14851485
tm.assert_frame_equal(expected, recons)
14861486

1487-
def test_to_excel_timedelta(self, engine, ext):
1487+
def test_to_excel_timedelta(self):
14881488
# see gh-19242, gh-9155
14891489
#
14901490
# Test writing timedelta to xls.
@@ -1502,7 +1502,7 @@ def test_to_excel_timedelta(self, engine, ext):
15021502
recons = pd.read_excel(reader, "test1", index_col=0)
15031503
tm.assert_frame_equal(expected, recons)
15041504

1505-
def test_to_excel_periodindex(self, engine, ext, tsframe):
1505+
def test_to_excel_periodindex(self, tsframe):
15061506
xp = tsframe.resample('M', kind='period').mean()
15071507

15081508
xp.to_excel(self.path, 'sht1')
@@ -1511,7 +1511,7 @@ def test_to_excel_periodindex(self, engine, ext, tsframe):
15111511
rs = pd.read_excel(reader, 'sht1', index_col=0)
15121512
tm.assert_frame_equal(xp, rs.to_period('M'))
15131513

1514-
def test_to_excel_multiindex(self, merge_cells, engine, ext, frame):
1514+
def test_to_excel_multiindex(self, merge_cells, frame):
15151515
arrays = np.arange(len(frame.index) * 2).reshape(2, -1)
15161516
new_index = MultiIndex.from_arrays(arrays,
15171517
names=['first', 'second'])
@@ -1527,7 +1527,7 @@ def test_to_excel_multiindex(self, merge_cells, engine, ext, frame):
15271527
tm.assert_frame_equal(frame, df)
15281528

15291529
# GH13511
1530-
def test_to_excel_multiindex_nan_label(self, merge_cells, engine, ext):
1530+
def test_to_excel_multiindex_nan_label(self, merge_cells):
15311531
df = pd.DataFrame({'A': [None, 2, 3],
15321532
'B': [10, 20, 30],
15331533
'C': np.random.sample(3)})
@@ -1540,7 +1540,7 @@ def test_to_excel_multiindex_nan_label(self, merge_cells, engine, ext):
15401540
# Test for Issue 11328. If column indices are integers, make
15411541
# sure they are handled correctly for either setting of
15421542
# merge_cells
1543-
def test_to_excel_multiindex_cols(self, merge_cells, engine, ext, frame):
1543+
def test_to_excel_multiindex_cols(self, merge_cells, frame):
15441544
arrays = np.arange(len(frame.index) * 2).reshape(2, -1)
15451545
new_index = MultiIndex.from_arrays(arrays,
15461546
names=['first', 'second'])
@@ -1563,8 +1563,7 @@ def test_to_excel_multiindex_cols(self, merge_cells, engine, ext, frame):
15631563
frame.columns = [".".join(map(str, q)) for q in zip(*fm)]
15641564
tm.assert_frame_equal(frame, df)
15651565

1566-
def test_to_excel_multiindex_dates(
1567-
self, merge_cells, engine, ext, tsframe):
1566+
def test_to_excel_multiindex_dates(self, merge_cells, tsframe):
15681567
# try multiindex with dates
15691568
new_index = [tsframe.index, np.arange(len(tsframe.index))]
15701569
tsframe.index = MultiIndex.from_arrays(new_index)
@@ -1577,7 +1576,7 @@ def test_to_excel_multiindex_dates(
15771576
tm.assert_frame_equal(tsframe, recons)
15781577
assert recons.index.names == ('time', 'foo')
15791578

1580-
def test_to_excel_multiindex_no_write_index(self, engine, ext):
1579+
def test_to_excel_multiindex_no_write_index(self):
15811580
# Test writing and re-reading a MI witout the index. GH 5616.
15821581

15831582
# Initial non-MI frame.
@@ -1598,7 +1597,7 @@ def test_to_excel_multiindex_no_write_index(self, engine, ext):
15981597
# Test that it is the same as the initial frame.
15991598
tm.assert_frame_equal(frame1, frame3)
16001599

1601-
def test_to_excel_float_format(self, engine, ext):
1600+
def test_to_excel_float_format(self):
16021601
df = DataFrame([[0.123456, 0.234567, 0.567567],
16031602
[12.32112, 123123.2, 321321.2]],
16041603
index=["A", "B"], columns=["X", "Y", "Z"])
@@ -1612,7 +1611,7 @@ def test_to_excel_float_format(self, engine, ext):
16121611
index=["A", "B"], columns=["X", "Y", "Z"])
16131612
tm.assert_frame_equal(result, expected)
16141613

1615-
def test_to_excel_output_encoding(self, engine, ext):
1614+
def test_to_excel_output_encoding(self, ext):
16161615
# Avoid mixed inferred_type.
16171616
df = DataFrame([["\u0192", "\u0193", "\u0194"],
16181617
["\u0195", "\u0196", "\u0197"]],
@@ -1625,7 +1624,7 @@ def test_to_excel_output_encoding(self, engine, ext):
16251624
encoding="utf8", index_col=0)
16261625
tm.assert_frame_equal(result, df)
16271626

1628-
def test_to_excel_unicode_filename(self, engine, ext):
1627+
def test_to_excel_unicode_filename(self, ext):
16291628
with ensure_clean("\u0192u." + ext) as filename:
16301629
try:
16311630
f = open(filename, "wb")
@@ -1750,8 +1749,8 @@ def test_to_excel_unicode_filename(self, engine, ext):
17501749
@pytest.mark.parametrize("use_headers", [True, False])
17511750
@pytest.mark.parametrize("r_idx_nlevels", [1, 2, 3])
17521751
@pytest.mark.parametrize("c_idx_nlevels", [1, 2, 3])
1753-
def test_excel_010_hemstring(self, merge_cells, engine, ext,
1754-
c_idx_nlevels, r_idx_nlevels, use_headers):
1752+
def test_excel_010_hemstring(self, merge_cells, c_idx_nlevels,
1753+
r_idx_nlevels, use_headers):
17551754

17561755
def roundtrip(data, header=True, parser_hdr=0, index=True):
17571756
data.to_excel(self.path, header=header,
@@ -1797,7 +1796,7 @@ def roundtrip(data, header=True, parser_hdr=0, index=True):
17971796
for c in range(len(res.columns)):
17981797
assert res.iloc[r, c] is not np.nan
17991798

1800-
def test_duplicated_columns(self, engine, ext):
1799+
def test_duplicated_columns(self):
18011800
# see gh-5235
18021801
df = DataFrame([[1, 2, 3], [1, 2, 3], [1, 2, 3]],
18031802
columns=["A", "B", "B"])
@@ -1836,7 +1835,7 @@ def test_duplicated_columns(self, engine, ext):
18361835
pd.read_excel(
18371836
self.path, "test1", header=None, mangle_dupe_cols=False)
18381837

1839-
def test_swapped_columns(self, engine, ext):
1838+
def test_swapped_columns(self):
18401839
# Test for issue #5427.
18411840
write_frame = DataFrame({'A': [1, 1, 1],
18421841
'B': [2, 2, 2]})
@@ -1847,7 +1846,7 @@ def test_swapped_columns(self, engine, ext):
18471846
tm.assert_series_equal(write_frame['A'], read_frame['A'])
18481847
tm.assert_series_equal(write_frame['B'], read_frame['B'])
18491848

1850-
def test_invalid_columns(self, engine, ext):
1849+
def test_invalid_columns(self):
18511850
# see gh-10982
18521851
write_frame = DataFrame({"A": [1, 1, 1],
18531852
"B": [2, 2, 2]})
@@ -1863,7 +1862,7 @@ def test_invalid_columns(self, engine, ext):
18631862
with pytest.raises(KeyError):
18641863
write_frame.to_excel(self.path, "test1", columns=["C", "D"])
18651864

1866-
def test_comment_arg(self, engine, ext):
1865+
def test_comment_arg(self):
18671866
# see gh-18735
18681867
#
18691868
# Test the comment argument functionality to pd.read_excel.
@@ -1883,7 +1882,7 @@ def test_comment_arg(self, engine, ext):
18831882
result2 = pd.read_excel(self.path, "test_c", comment="#", index_col=0)
18841883
tm.assert_frame_equal(result1, result2)
18851884

1886-
def test_comment_default(self, engine, ext):
1885+
def test_comment_default(self):
18871886
# Re issue #18735
18881887
# Test the comment argument default to pd.read_excel
18891888

@@ -1897,7 +1896,7 @@ def test_comment_default(self, engine, ext):
18971896
result2 = pd.read_excel(self.path, 'test_c', comment=None)
18981897
tm.assert_frame_equal(result1, result2)
18991898

1900-
def test_comment_used(self, engine, ext):
1899+
def test_comment_used(self):
19011900
# see gh-18735
19021901
#
19031902
# Test the comment argument is working as expected when used.
@@ -1913,7 +1912,7 @@ def test_comment_used(self, engine, ext):
19131912
result = pd.read_excel(self.path, "test_c", comment="#", index_col=0)
19141913
tm.assert_frame_equal(result, expected)
19151914

1916-
def test_comment_empty_line(self, engine, ext):
1915+
def test_comment_empty_line(self):
19171916
# Re issue #18735
19181917
# Test that pd.read_excel ignores commented lines at the end of file
19191918

@@ -1925,7 +1924,7 @@ def test_comment_empty_line(self, engine, ext):
19251924
result = pd.read_excel(self.path, comment='#')
19261925
tm.assert_frame_equal(result, expected)
19271926

1928-
def test_datetimes(self, engine, ext):
1927+
def test_datetimes(self):
19291928

19301929
# Test writing and reading datetimes. For issue #9139. (xref #9185)
19311930
datetimes = [datetime(2013, 1, 13, 1, 2, 3),
@@ -1946,7 +1945,7 @@ def test_datetimes(self, engine, ext):
19461945

19471946
tm.assert_series_equal(write_frame['A'], read_frame['A'])
19481947

1949-
def test_bytes_io(self, engine, ext):
1948+
def test_bytes_io(self, engine):
19501949
# see gh-7074
19511950
bio = BytesIO()
19521951
df = DataFrame(np.random.randn(10, 2))
@@ -1960,7 +1959,7 @@ def test_bytes_io(self, engine, ext):
19601959
reread_df = pd.read_excel(bio, index_col=0)
19611960
tm.assert_frame_equal(df, reread_df)
19621961

1963-
def test_write_lists_dict(self, engine, ext):
1962+
def test_write_lists_dict(self):
19641963
# see gh-8188.
19651964
df = DataFrame({"mixed": ["a", ["b", "c"], {"d": "e", "f": 2}],
19661965
"numeric": [1, 2, 3.0],
@@ -1974,7 +1973,7 @@ def test_write_lists_dict(self, engine, ext):
19741973

19751974
tm.assert_frame_equal(read, expected)
19761975

1977-
def test_true_and_false_value_options(self, engine, ext):
1976+
def test_true_and_false_value_options(self):
19781977
# see gh-13347
19791978
df = pd.DataFrame([["foo", "bar"]], columns=["col1", "col2"])
19801979
expected = df.replace({"foo": True, "bar": False})
@@ -1984,7 +1983,7 @@ def test_true_and_false_value_options(self, engine, ext):
19841983
false_values=["bar"], index_col=0)
19851984
tm.assert_frame_equal(read_frame, expected)
19861985

1987-
def test_freeze_panes(self, engine, ext):
1986+
def test_freeze_panes(self):
19881987
# see gh-15160
19891988
expected = DataFrame([[1, 2], [3, 4]], columns=["col1", "col2"])
19901989
expected.to_excel(self.path, "Sheet1", freeze_panes=(1, 1))

0 commit comments

Comments
 (0)