From cc5fc3984daa717251d269b929cc9e9dbd2be327 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 3 Dec 2019 20:31:22 -0800 Subject: [PATCH 1/2] revert openpyxl test changes --- pandas/tests/io/excel/test_openpyxl.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pandas/tests/io/excel/test_openpyxl.py b/pandas/tests/io/excel/test_openpyxl.py index 90e795bd5c52f..95384022730ef 100644 --- a/pandas/tests/io/excel/test_openpyxl.py +++ b/pandas/tests/io/excel/test_openpyxl.py @@ -4,8 +4,6 @@ import numpy as np import pytest -from pandas.compat import PY37, is_platform_mac - import pandas as pd from pandas import DataFrame import pandas.util.testing as tm @@ -16,8 +14,6 @@ pytestmark = pytest.mark.parametrize("ext", [".xlsx"]) -openpyxl_gt301 = LooseVersion(openpyxl.__version__) > LooseVersion("3.0.1") - def test_to_excel_styleconverter(ext): from openpyxl import styles @@ -86,9 +82,6 @@ def test_write_cells_merge_styled(ext): assert xcell_a2.font == openpyxl_sty_merged -@pytest.mark.xfail( - openpyxl_gt301 and PY37 and is_platform_mac(), reason="broken change in openpyxl" -) @pytest.mark.parametrize( "mode,expected", [("w", ["baz"]), ("a", ["foo", "bar", "baz"])] ) @@ -115,9 +108,6 @@ def test_write_append_mode(ext, mode, expected): assert wb2.worksheets[index]["A1"].value == cell_value -@pytest.mark.xfail( - openpyxl_gt301 and PY37 and is_platform_mac(), reason="broken change in openpyxl" -) def test_to_excel_with_openpyxl_engine(ext, tmpdir): # GH 29854 # TODO: Fix this once newer version of openpyxl fixes the bug From 50a37d060a14e01ef98cb063fe8b74cea04388d6 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 3 Dec 2019 21:22:59 -0800 Subject: [PATCH 2/2] flake8 --- pandas/tests/io/excel/test_openpyxl.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/tests/io/excel/test_openpyxl.py b/pandas/tests/io/excel/test_openpyxl.py index 95384022730ef..e8c60870e2a85 100644 --- a/pandas/tests/io/excel/test_openpyxl.py +++ b/pandas/tests/io/excel/test_openpyxl.py @@ -1,4 +1,3 @@ -from distutils.version import LooseVersion import os import numpy as np