Skip to content

Commit f85b742

Browse files
WillAydproost
authored andcommitted
revert openpyxl test changes (pandas-dev#30033)
1 parent 0341bdf commit f85b742

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

pandas/tests/io/excel/test_openpyxl.py

-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
from distutils.version import LooseVersion
21
import os
32

43
import numpy as np
54
import pytest
65

7-
from pandas.compat import PY37, is_platform_mac
8-
96
import pandas as pd
107
from pandas import DataFrame
118
import pandas.util.testing as tm
@@ -16,8 +13,6 @@
1613

1714
pytestmark = pytest.mark.parametrize("ext", [".xlsx"])
1815

19-
openpyxl_gt301 = LooseVersion(openpyxl.__version__) > LooseVersion("3.0.1")
20-
2116

2217
def test_to_excel_styleconverter(ext):
2318
from openpyxl import styles
@@ -86,9 +81,6 @@ def test_write_cells_merge_styled(ext):
8681
assert xcell_a2.font == openpyxl_sty_merged
8782

8883

89-
@pytest.mark.xfail(
90-
openpyxl_gt301 and PY37 and is_platform_mac(), reason="broken change in openpyxl"
91-
)
9284
@pytest.mark.parametrize(
9385
"mode,expected", [("w", ["baz"]), ("a", ["foo", "bar", "baz"])]
9486
)
@@ -115,9 +107,6 @@ def test_write_append_mode(ext, mode, expected):
115107
assert wb2.worksheets[index]["A1"].value == cell_value
116108

117109

118-
@pytest.mark.xfail(
119-
openpyxl_gt301 and PY37 and is_platform_mac(), reason="broken change in openpyxl"
120-
)
121110
def test_to_excel_with_openpyxl_engine(ext, tmpdir):
122111
# GH 29854
123112
# TODO: Fix this once newer version of openpyxl fixes the bug

0 commit comments

Comments
 (0)