Skip to content

Commit

Permalink
Merge branch '2.2.x' into auto-backport-of-pr-57490-on-2.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
phofl authored Feb 19, 2024
2 parents 7390f8e + 25df68e commit 339602d
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pandas/tests/io/excel/test_odf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@
import numpy as np
import pytest

from pandas.compat import is_platform_windows

import pandas as pd
import pandas._testing as tm

pytest.importorskip("odf")

if is_platform_windows():
pytestmark = pytest.mark.single_cpu


@pytest.fixture(autouse=True)
def cd_and_set_engine(monkeypatch, datapath):
Expand Down
5 changes: 5 additions & 0 deletions pandas/tests/io/excel/test_odswriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@

import pytest

from pandas.compat import is_platform_windows

import pandas as pd
import pandas._testing as tm

from pandas.io.excel import ExcelWriter

odf = pytest.importorskip("odf")

if is_platform_windows():
pytestmark = pytest.mark.single_cpu


@pytest.fixture
def ext():
Expand Down
5 changes: 5 additions & 0 deletions pandas/tests/io/excel/test_openpyxl.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import numpy as np
import pytest

from pandas.compat import is_platform_windows

import pandas as pd
from pandas import DataFrame
import pandas._testing as tm
Expand All @@ -17,6 +19,9 @@

openpyxl = pytest.importorskip("openpyxl")

if is_platform_windows():
pytestmark = pytest.mark.single_cpu


@pytest.fixture
def ext():
Expand Down
4 changes: 4 additions & 0 deletions pandas/tests/io/excel/test_readers.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

from pandas._config import using_pyarrow_string_dtype

from pandas.compat import is_platform_windows
import pandas.util._test_decorators as td

import pandas as pd
Expand All @@ -34,6 +35,9 @@
StringArray,
)

if is_platform_windows():
pytestmark = pytest.mark.single_cpu

read_ext_params = [".xls", ".xlsx", ".xlsm", ".xlsb", ".ods"]
engine_params = [
# Add any engines to test here
Expand Down
4 changes: 4 additions & 0 deletions pandas/tests/io/excel/test_style.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import numpy as np
import pytest

from pandas.compat import is_platform_windows
import pandas.util._test_decorators as td

from pandas import (
Expand All @@ -20,6 +21,9 @@
# could compute styles and render to excel without jinja2, since there is no
# 'template' file, but this needs the import error to delayed until render time.

if is_platform_windows():
pytestmark = pytest.mark.single_cpu


def assert_equal_cell_styles(cell1, cell2):
# TODO: should find a better way to check equality
Expand Down
4 changes: 4 additions & 0 deletions pandas/tests/io/excel/test_writers.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import numpy as np
import pytest

from pandas.compat import is_platform_windows
from pandas.compat._constants import PY310
from pandas.compat._optional import import_optional_dependency
import pandas.util._test_decorators as td
Expand All @@ -34,6 +35,9 @@
)
from pandas.io.excel._util import _writers

if is_platform_windows():
pytestmark = pytest.mark.single_cpu


def get_exp_unit(path: str) -> str:
return "ns"
Expand Down
5 changes: 5 additions & 0 deletions pandas/tests/io/excel/test_xlrd.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import numpy as np
import pytest

from pandas.compat import is_platform_windows

import pandas as pd
import pandas._testing as tm

Expand All @@ -11,6 +13,9 @@

xlrd = pytest.importorskip("xlrd")

if is_platform_windows():
pytestmark = pytest.mark.single_cpu


@pytest.fixture(params=[".xls"])
def read_ext_xlrd(request):
Expand Down
5 changes: 5 additions & 0 deletions pandas/tests/io/excel/test_xlsxwriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

import pytest

from pandas.compat import is_platform_windows

from pandas import DataFrame
import pandas._testing as tm

from pandas.io.excel import ExcelWriter

xlsxwriter = pytest.importorskip("xlsxwriter")

if is_platform_windows():
pytestmark = pytest.mark.single_cpu


@pytest.fixture
def ext():
Expand Down

0 comments on commit 339602d

Please sign in to comment.