Skip to content

Commit

Permalink
Revert "CI: Run excel tests on single cpu for windows (pandas-dev#57486
Browse files Browse the repository at this point in the history
…)"

This reverts commit 9c02050.
  • Loading branch information
mroeschke committed Feb 20, 2024
1 parent 6125cab commit 53f7f13
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 37 deletions.
5 changes: 0 additions & 5 deletions pandas/tests/io/excel/test_odf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,11 @@
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: 0 additions & 5 deletions pandas/tests/io/excel/test_odswriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,13 @@

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: 0 additions & 5 deletions pandas/tests/io/excel/test_openpyxl.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
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 @@ -19,9 +17,6 @@

openpyxl = pytest.importorskip("openpyxl")

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


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

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 @@ -35,9 +34,6 @@
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: 0 additions & 4 deletions pandas/tests/io/excel/test_style.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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 @@ -21,9 +20,6 @@
# 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: 0 additions & 4 deletions pandas/tests/io/excel/test_writers.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
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 @@ -35,9 +34,6 @@
)
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: 0 additions & 5 deletions pandas/tests/io/excel/test_xlrd.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import numpy as np
import pytest

from pandas.compat import is_platform_windows

import pandas as pd
import pandas._testing as tm

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

xlrd = pytest.importorskip("xlrd")

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


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

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 53f7f13

Please sign in to comment.