Skip to content

Commit e00f5a7

Browse files
committed
Add test skip for new tinycss2 dependency
1 parent 7454dc5 commit e00f5a7

25 files changed

+116
-32
lines changed

pandas/tests/frame/test_api.py

+1
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ def test_constructor_expanddim(self):
378378
df._constructor_expanddim(np.arange(27).reshape(3, 3, 3))
379379

380380
@skip_if_no("jinja2")
381+
@skip_if_no("tinycss2")
381382
def test_inspect_getmembers(self):
382383
# GH38740
383384
df = DataFrame()

pandas/tests/io/excel/test_openpyxl.py

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
)
1616

1717
openpyxl = pytest.importorskip("openpyxl")
18+
pytest.importorskip("tinycss2")
1819

1920
pytestmark = pytest.mark.parametrize("ext", [".xlsx"])
2021

pandas/tests/io/excel/test_style.py

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
)
1313
import pandas._testing as tm
1414

15+
pytest.importorskip("tinycss2")
1516
from pandas.io.excel import ExcelWriter
1617
from pandas.io.formats.excel import ExcelFormatter
1718

pandas/tests/io/excel/test_writers.py

+58-10
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,39 @@ def set_engine(engine, ext):
5959
@pytest.mark.parametrize(
6060
"ext",
6161
[
62-
pytest.param(".xlsx", marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")]),
63-
pytest.param(".xlsm", marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")]),
64-
pytest.param(".xls", marks=[td.skip_if_no("xlwt"), td.skip_if_no("xlrd")]),
6562
pytest.param(
66-
".xlsx", marks=[td.skip_if_no("xlsxwriter"), td.skip_if_no("xlrd")]
63+
".xlsx",
64+
marks=[
65+
td.skip_if_no("openpyxl"),
66+
td.skip_if_no("xlrd"),
67+
td.skip_if_no("tinycss2"),
68+
],
69+
),
70+
pytest.param(
71+
".xlsm",
72+
marks=[
73+
td.skip_if_no("openpyxl"),
74+
td.skip_if_no("xlrd"),
75+
td.skip_if_no("tinycss2"),
76+
],
6777
),
68-
pytest.param(".ods", marks=td.skip_if_no("odf")),
78+
pytest.param(
79+
".xls",
80+
marks=[
81+
td.skip_if_no("xlwt"),
82+
td.skip_if_no("xlrd"),
83+
td.skip_if_no("tinycss2"),
84+
],
85+
),
86+
pytest.param(
87+
".xlsx",
88+
marks=[
89+
td.skip_if_no("xlsxwriter"),
90+
td.skip_if_no("xlrd"),
91+
td.skip_if_no("tinycss2"),
92+
],
93+
),
94+
pytest.param(".ods", marks=[td.skip_if_no("odf"), td.skip_if_no("tinycss2")]),
6995
],
7096
)
7197
class TestRoundTrip:
@@ -312,22 +338,42 @@ def test_multiindex_interval_datetimes(self, ext):
312338
pytest.param(
313339
"openpyxl",
314340
".xlsx",
315-
marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")],
341+
marks=[
342+
td.skip_if_no("openpyxl"),
343+
td.skip_if_no("xlrd"),
344+
td.skip_if_no("tinycss2"),
345+
],
316346
),
317347
pytest.param(
318348
"openpyxl",
319349
".xlsm",
320-
marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")],
350+
marks=[
351+
td.skip_if_no("openpyxl"),
352+
td.skip_if_no("xlrd"),
353+
td.skip_if_no("tinycss2"),
354+
],
321355
),
322356
pytest.param(
323-
"xlwt", ".xls", marks=[td.skip_if_no("xlwt"), td.skip_if_no("xlrd")]
357+
"xlwt",
358+
".xls",
359+
marks=[
360+
td.skip_if_no("xlwt"),
361+
td.skip_if_no("xlrd"),
362+
td.skip_if_no("tinycss2"),
363+
],
324364
),
325365
pytest.param(
326366
"xlsxwriter",
327367
".xlsx",
328-
marks=[td.skip_if_no("xlsxwriter"), td.skip_if_no("xlrd")],
368+
marks=[
369+
td.skip_if_no("xlsxwriter"),
370+
td.skip_if_no("xlrd"),
371+
td.skip_if_no("tinycss2"),
372+
],
373+
),
374+
pytest.param(
375+
"odf", ".ods", marks=[td.skip_if_no("odf"), td.skip_if_no("tinycss2")]
329376
),
330-
pytest.param("odf", ".ods", marks=td.skip_if_no("odf")),
331377
],
332378
)
333379
@pytest.mark.usefixtures("set_engine")
@@ -1324,6 +1370,7 @@ def test_ExcelWriter_dispatch_raises(self):
13241370
with pytest.raises(ValueError, match="No engine"):
13251371
ExcelWriter("nothing")
13261372

1373+
@td.skip_if_no("tinycss2")
13271374
def test_register_writer(self):
13281375
class DummyClass(ExcelWriter):
13291376
called_save = False
@@ -1386,6 +1433,7 @@ def test_engine_kwargs_and_kwargs_raises(self, ext):
13861433

13871434
@td.skip_if_no("xlrd")
13881435
@td.skip_if_no("openpyxl")
1436+
@td.skip_if_no("tinycss2")
13891437
class TestFSPath:
13901438
def test_excelfile_fspath(self):
13911439
with tm.ensure_clean("foo.xlsx") as path:

pandas/tests/io/excel/test_xlrd.py

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import pytest
44

55
from pandas.compat._optional import import_optional_dependency
6+
import pandas.util._test_decorators as td
67

78
import pandas as pd
89
import pandas._testing as tm
@@ -31,6 +32,7 @@ def read_ext_xlrd(request):
3132
return request.param
3233

3334

35+
@td.skip_if_no("tinycss2")
3436
def test_read_xlrd_book(read_ext_xlrd, frame):
3537
df = frame
3638

pandas/tests/io/excel/test_xlsxwriter.py

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
import pytest
66

7+
import pandas.util._test_decorators as td
8+
79
from pandas import DataFrame
810
import pandas._testing as tm
911

@@ -14,6 +16,7 @@
1416
pytestmark = pytest.mark.parametrize("ext", [".xlsx"])
1517

1618

19+
@td.skip_if_no("tinycss2")
1720
def test_column_format(ext):
1821
# Test that column formats are applied to cells. Test for issue #9167.
1922
# Applicable to xlsxwriter only.

pandas/tests/io/excel/test_xlwt.py

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import numpy as np
44
import pytest
55

6+
import pandas.util._test_decorators as td
7+
68
from pandas import (
79
DataFrame,
810
MultiIndex,
@@ -20,6 +22,7 @@
2022
pytestmark = pytest.mark.parametrize("ext,", [".xls"])
2123

2224

25+
@td.skip_if_no("tinycss2")
2326
def test_excel_raise_error_on_multiindex_columns_and_no_index(ext):
2427
# MultiIndex as columns is not yet implemented 9794
2528
cols = MultiIndex.from_tuples(
@@ -36,6 +39,7 @@ def test_excel_raise_error_on_multiindex_columns_and_no_index(ext):
3639
df.to_excel(path, index=False)
3740

3841

42+
@td.skip_if_no("tinycss2")
3943
def test_excel_multiindex_columns_and_index_true(ext):
4044
cols = MultiIndex.from_tuples(
4145
[("site", ""), ("2014", "height"), ("2014", "weight")]
@@ -45,6 +49,7 @@ def test_excel_multiindex_columns_and_index_true(ext):
4549
df.to_excel(path, index=True)
4650

4751

52+
@td.skip_if_no("tinycss2")
4853
def test_excel_multiindex_index(ext):
4954
# MultiIndex as index works so assert no error #9794
5055
cols = MultiIndex.from_tuples(
@@ -80,6 +85,7 @@ def test_write_append_mode_raises(ext):
8085
ExcelWriter(f, engine="xlwt", mode="a")
8186

8287

88+
@td.skip_if_no("tinycss2")
8389
def test_to_excel_xlwt_warning(ext):
8490
# GH 26552
8591
df = DataFrame(np.random.randn(3, 10))
@@ -101,6 +107,7 @@ def test_option_xls_writer_deprecated(ext):
101107
options.io.excel.xls.writer = "xlwt"
102108

103109

110+
@td.skip_if_no("tinycss2")
104111
@pytest.mark.parametrize("style_compression", [0, 2])
105112
def test_kwargs(ext, style_compression):
106113
# GH 42286
@@ -116,6 +123,7 @@ def test_kwargs(ext, style_compression):
116123
DataFrame().to_excel(writer)
117124

118125

126+
@td.skip_if_no("tinycss2")
119127
@pytest.mark.parametrize("style_compression", [0, 2])
120128
def test_engine_kwargs(ext, style_compression):
121129
# GH 42286

pandas/tests/io/formats/style/test_bar.py

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from pandas import DataFrame
55

66
pytest.importorskip("jinja2")
7+
pytest.importorskip("tinycss2")
78

89

910
def bar_grad(a=None, b=None, c=None, d=None):

pandas/tests/io/formats/style/test_deprecated.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import pytest
66

77
jinja2 = pytest.importorskip("jinja2")
8+
jinja2 = pytest.importorskip("tinycss2")
89

910
from pandas import (
1011
DataFrame,

pandas/tests/io/formats/style/test_exceptions.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import pytest
22

33
jinja2 = pytest.importorskip("jinja2")
4+
jinja2 = pytest.importorskip("tinycss2")
45

56
from pandas import (
67
DataFrame,

pandas/tests/io/formats/style/test_format.py

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
)
1313

1414
pytest.importorskip("jinja2")
15+
pytest.importorskip("tinycss2")
1516
from pandas.io.formats.style import Styler
1617
from pandas.io.formats.style_render import _str_escape
1718

pandas/tests/io/formats/style/test_highlight.py

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
)
99

1010
pytest.importorskip("jinja2")
11+
pytest.importorskip("tinyccs2")
1112

1213
from pandas.io.formats.style import Styler
1314

pandas/tests/io/formats/style/test_html.py

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
)
1111

1212
jinja2 = pytest.importorskip("jinja2")
13+
pytest.importorskip("tinycss2")
1314
from pandas.io.formats.style import Styler
1415

1516
loader = jinja2.PackageLoader("pandas", "io/formats/templates")

pandas/tests/io/formats/style/test_matplotlib.py

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
pytest.importorskip("matplotlib")
1111
pytest.importorskip("jinja2")
12+
pytest.importorskip("tinycss2")
1213

1314
import matplotlib as mpl
1415

pandas/tests/io/formats/style/test_non_unique.py

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
)
99

1010
pytest.importorskip("jinja2")
11+
pytest.importorskip("tinycss2")
1112

1213
from pandas.io.formats.style import Styler
1314

pandas/tests/io/formats/style/test_style.py

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import pandas._testing as tm
1616

1717
jinja2 = pytest.importorskip("jinja2")
18+
pytest.importorskip("tinycss2")
1819
from pandas.io.formats.style import ( # isort:skip
1920
Styler,
2021
)

pandas/tests/io/formats/style/test_to_latex.py

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
)
1111

1212
pytest.importorskip("jinja2")
13+
pytest.importorskip("tinycss2")
1314
from pandas.io.formats.style import Styler
1415
from pandas.io.formats.style_render import (
1516
_parse_latex_cell_styles,

pandas/tests/io/formats/style/test_to_string.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from pandas import DataFrame
66

77
pytest.importorskip("jinja2")
8+
pytest.importorskip("tinycss2")
89
from pandas.io.formats.style import Styler
910

1011

pandas/tests/io/formats/style/test_tooltip.py

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from pandas import DataFrame
55

66
pytest.importorskip("jinja2")
7+
pytest.importorskip("tinycss2")
78
from pandas.io.formats.style import Styler
89

910

pandas/tests/io/formats/test_css.py

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import pandas._testing as tm
66

7+
pytest.importorskip("tinycss2")
78
from pandas.io.formats.css import CSSResolver
89

910

pandas/tests/io/formats/test_to_excel.py

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import pandas._testing as tm
1313

14+
pytest.importorskip("tinycss2")
1415
from pandas.io.formats.excel import (
1516
CssExcelCell,
1617
CSSToExcelConverter,

0 commit comments

Comments
 (0)