commonize var

Author: MarieSacksick

skrub/_dataframe/tests/test_common.py

@@ -18,6 +18,7 @@
 import skrub
 from skrub import selectors as s
 from skrub._dataframe import _common as ns
+from skrub.conftest import polars_installed_without_pyarrow
 
 
 def test_not_implemented():
@@ -725,7 +726,7 @@ def test_mean(df_module):
     )
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_corr(df_module):
     df = df_module.example_dataframe
 

skrub/_reporting/tests/test_patch_display.py

@@ -3,11 +3,12 @@
 import pytest
 
 from skrub import patch_display, unpatch_display
+from skrub.conftest import polars_installed_without_pyarrow
 
 
 @pytest.mark.parametrize("repeat_patch", [1, 2])
 @pytest.mark.parametrize("repeat_unpatch", [1, 2])
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_patch_display(df_module, repeat_patch, repeat_unpatch, capsys):
     df = df_module.make_dataframe(
         dict(

skrub/_reporting/tests/test_summarize.py

@@ -9,12 +9,13 @@
 from skrub import _dataframe as sbd
 from skrub._reporting import _sample_table
 from skrub._reporting._summarize import summarize_dataframe
+from skrub.conftest import polars_installed_without_pyarrow
 
 
 @pytest.mark.parametrize("order_by", [None, "date.utc", "value"])
 @pytest.mark.parametrize("with_plots", [False, True])
 @pytest.mark.parametrize("with_associations", [False, True])
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_summarize(
     monkeypatch, df_module, air_quality, order_by, with_plots, with_associations
 ):
@@ -115,7 +116,7 @@ def test_high_cardinality_column(pd_module):
     assert "10 most frequent" in summary["columns"][0]["value_counts_plot"]
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_all_null(df_module):
     df = df_module.make_dataframe(
         {
@@ -144,7 +145,7 @@ def make_summary(df_size, **summarize_kwargs):
     return make_summary
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_small_df(small_df_summary):
     summary = small_df_summary(11)
     thead, first_slice, ellipsis, last_slice = summary["sample_table"]["parts"]
@@ -259,7 +260,7 @@ def test_duplicate_columns(pd_module):
     assert cols[1]["mean"] == 3.5
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_high_cardinality_columns(df_module):
     df = df_module.make_dataframe(
         {

skrub/_reporting/tests/test_table_report.py

@@ -11,13 +11,14 @@
 from skrub import TableReport, ToDatetime, datasets
 from skrub import _dataframe as sbd
 from skrub._reporting._sample_table import make_table
+from skrub.conftest import polars_installed_without_pyarrow
 
 
 def get_report_id(html):
     return re.search(r'<skrub-table-report.*?id="report_([a-z0-9]+)"', html).group(1)
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_report(air_quality):
     col_filt = {
         "first_2": {
@@ -65,13 +66,13 @@ def test_report(air_quality):
     assert len(all_report_ids) == len(set(all_report_ids))
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_few_columns(df_module, check_polars_numpy2):
     report = TableReport(df_module.example_dataframe)
     assert "First 10 columns" not in report.html()
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_few_rows(df_module, check_polars_numpy2):
     df = sbd.slice(df_module.example_dataframe, 2)
     TableReport(df).html()
@@ -87,15 +88,15 @@ def test_open(pd_module, browser_mock):
     assert b"the title" in browser_mock.content
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_non_hashable_values(df_module):
     # non-regression test for #1066
     df = df_module.make_dataframe(dict(a=[[1, 2, 3], None, [4]]))
     html = TableReport(df).html()
     assert "[1, 2, 3]" in html
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_nat(df_module):
     # non-regression for:
     # https://github.com/skrub-data/skrub/issues/1111
@@ -114,7 +115,7 @@ def test_duplicate_columns(pd_module):
     TableReport(df).html()
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_infinite_values(df_module):
     # Non-regression for https://github.com/skrub-data/skrub/issues/1134
     # (histogram plot failing with infinite values)
@@ -128,7 +129,7 @@ def test_infinite_values(df_module):
     TableReport(df).html()
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_duration(df_module):
     df = df_module.make_dataframe(
         {"a": [datetime.timedelta(days=2), datetime.timedelta(days=3)]}
@@ -187,7 +188,7 @@ def test_write_html_with_not_utf8_encoding(tmp_path, pd_module):
     assert "</html>" not in saved_content
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_verbosity_parameter(df_module, capsys):
     df = df_module.make_dataframe(
         dict(
@@ -210,7 +211,7 @@ def test_verbosity_parameter(df_module, capsys):
     assert capsys.readouterr().err != ""
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_write_to_stderr(df_module, capsys):
     df = df_module.make_dataframe(
         dict(
@@ -231,7 +232,7 @@ def test_write_to_stderr(df_module, capsys):
     assert re.search(pattern, captured.err)
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_max_plot_columns_parameter(df_module):
     df = df_module.make_dataframe(
         {f"col_{i}": [i + j for j in range(3)] for i in range(10)}
@@ -291,7 +292,7 @@ def test_error_input_type():
         TableReport(df)
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_single_column_report(df_module):
     # Check that single column report works
     single_col = df_module.example_column

skrub/conftest.py

@@ -95,12 +95,22 @@ def _example_data_dict():
 except ImportError:
     _POLARS_INSTALLED = False
 
-try:
-    import pyarrow  # noqa: F401
+if _POLARS_INSTALLED:
+    try:
+        import pyarrow  # noqa: F401
 
-    _PYARROW_INSTALLED = True
-except ImportError:
-    _PYARROW_INSTALLED = False
+        _polars_installed_without_pyarrow = False
+    except ImportError:
+        _polars_installed_without_pyarrow = True
+else:
+    _polars_installed_without_pyarrow = False
+
+polars_installed_without_pyarrow = pytest.mark.skipif(
+    _polars_installed_without_pyarrow=False,
+    reason="When polars is installed, requires pyarrow to be installed too",
+)
+
+pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
 
 
 def _pl_from_dict(data):

skrub/tests/test_check_input.py

@@ -4,6 +4,7 @@
 
 from skrub import _dataframe as sbd
 from skrub._check_input import CheckInputDataFrame
+from skrub.conftest import polars_installed_without_pyarrow
 
 
 def test_good_input(df_module):
@@ -38,7 +39,7 @@ def test_input_is_an_array():
         check.fit_transform(np.ones((2,)))
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_wrong_dataframe_library_in_transform():
     pl = pytest.importorskip("polars")
     df = pl.DataFrame({"a": [0, 1], "b": [10, 20]})

skrub/tests/test_column_associations.py

@@ -5,9 +5,10 @@
 
 from skrub import _dataframe as sbd
 from skrub import column_associations
+from skrub.conftest import polars_installed_without_pyarrow
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_column_associations(df_module):
     x = (np.ones((7, 3)) * np.arange(3)).ravel()
     y = 2 - 3 * x
@@ -27,7 +28,7 @@ def test_column_associations(df_module):
     )
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_infinite(df_module):
     # non-regression test for https://github.com/skrub-data/skrub/issues/1133
     # (column associations would raise an exception on low-cardinality float

skrub/tests/test_fuzzy_join.py

@@ -8,6 +8,7 @@
 from skrub import ToDatetime, _join_utils, fuzzy_join
 from skrub import selectors as s
 from skrub._dataframe import _common as ns
+from skrub.conftest import polars_installed_without_pyarrow
 
 
 @pytest.mark.parametrize(
@@ -237,7 +238,7 @@ def test_numerical_column(df_module):
     assert ns.shape(fj_num3) == (2, n_cols)
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_datetime_column(df_module):
     """
     Testing that ``fuzzy_join`` works with datetime columns.
@@ -293,7 +294,7 @@ def to_dt(lst):
     assert ns.shape(fj_time3) == (2, n_cols)
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_mixed_joins(df_module):
     """
     Test fuzzy joining on mixed and multiple column types.

skrub/tests/test_join_utils.py

@@ -6,6 +6,7 @@
 
 from skrub import _dataframe as sbd
 from skrub import _join_utils
+from skrub.conftest import polars_installed_without_pyarrow
 
 
 @pytest.mark.parametrize(
@@ -173,6 +174,7 @@ def test_left_join_wrong_right_type(df_module, left):
         )
 
 
+@polars_installed_without_pyarrow
 def test_left_join_types_not_equal(df_module, left):
     try:
         import polars as pl

skrub/tests/test_to_datetime.py

@@ -16,6 +16,7 @@
     _get_time_zone,
     to_datetime,
 )
+from skrub.conftest import polars_installed_without_pyarrow
 
 ISO = "%Y-%m-%dT%H:%M:%S"
 
@@ -44,7 +45,7 @@ def datetime_col(df_module):
     return sbd.col(df_module.example_dataframe, "datetime-col")
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 @pytest.mark.parametrize(
     "format",
     [
@@ -86,7 +87,7 @@ def test_datetime_to_datetime(datetime_col):
     assert encoder.format_ is None
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_rejected_columns(df_module):
     with pytest.raises(ValueError, match=".*does not contain strings"):
         ToDatetime().fit_transform(sbd.col(df_module.example_dataframe, "float-col"))
@@ -98,7 +99,7 @@ def test_rejected_columns(df_module):
         )
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_transform_failures(datetime_col, df_module):
     encoder = ToDatetime().fit(strftime(datetime_col, ISO))
     test_col = df_module.make_column(
@@ -109,7 +110,7 @@ def test_transform_failures(datetime_col, df_module):
     assert sbd.to_list(sbd.fill_nulls(strftime(transformed, ISO), "????")) == expected
 
 
-@pytest.mark.skipif(_PYARROW_INSTALLED=False, reason="requires pyarrow to be installed")
+@polars_installed_without_pyarrow
 def test_mixed_offsets(df_module):
     s = df_module.make_column(
         "when", ["2020-01-02T08:00:01+02:00", "2020-01-02T08:00:01+04:00"]