From 059a327a3659c81215b1fb51193b0a5ba6c9adf8 Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Mon, 3 Mar 2025 14:56:22 -0800
Subject: [PATCH 1/2] Backport PR #61042: CI/TST: Fix xfail in
 test_columns_dtypes_not_invalid for pyarrow nightly

---
 pandas/compat/pyarrow.py        |  2 ++
 pandas/tests/io/test_parquet.py | 44 +++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/pandas/compat/pyarrow.py b/pandas/compat/pyarrow.py
index 81a2d0dc80a10..d78827042e95c 100644
--- a/pandas/compat/pyarrow.py
+++ b/pandas/compat/pyarrow.py
@@ -19,6 +19,7 @@
     pa_version_under17p0 = _palv < Version("17.0.0")
     pa_version_under18p0 = _palv < Version("18.0.0")
     pa_version_under19p0 = _palv < Version("19.0.0")
+    pa_version_under20p0 = _palv < Version("20.0.0")
     HAS_PYARROW = True
 except ImportError:
     pa_version_under10p1 = True
@@ -32,4 +33,5 @@
     pa_version_under17p0 = True
     pa_version_under18p0 = True
     pa_version_under19p0 = True
+    pa_version_under20p0 = True
     HAS_PYARROW = False
diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py
index f66ee7dc4367e..c8c041901db3d 100644
--- a/pandas/tests/io/test_parquet.py
+++ b/pandas/tests/io/test_parquet.py
@@ -19,7 +19,9 @@
     pa_version_under11p0,
     pa_version_under13p0,
     pa_version_under15p0,
+    pa_version_under17p0,
     pa_version_under19p0,
+    pa_version_under20p0,
 )
 
 import pandas as pd
@@ -1103,24 +1105,34 @@ def test_read_dtype_backend_pyarrow_config_index(self, pa):
             expected=expected,
         )
 
-    def test_columns_dtypes_not_invalid(self, pa):
+    @pytest.mark.parametrize(
+        "columns",
+        [
+            [0, 1],
+            pytest.param(
+                [b"foo", b"bar"],
+                marks=pytest.mark.xfail(
+                    pa_version_under20p0,
+                    raises=NotImplementedError,
+                    reason="https://github.com/apache/arrow/pull/44171",
+                ),
+            ),
+            pytest.param(
+                [
+                    datetime.datetime(2011, 1, 1, 0, 0),
+                    datetime.datetime(2011, 1, 1, 1, 1),
+                ],
+                marks=pytest.mark.xfail(
+                    pa_version_under17p0,
+                    reason="pa.pandas_compat passes 'datetime64' to .astype",
+                ),
+            ),
+        ],
+    )
+    def test_columns_dtypes_not_invalid(self, pa, columns):
         df = pd.DataFrame({"string": list("abc"), "int": list(range(1, 4))})
 
-        # numeric
-        df.columns = [0, 1]
-        check_round_trip(df, pa)
-
-        # bytes
-        df.columns = [b"foo", b"bar"]
-        with pytest.raises(NotImplementedError, match="|S3"):
-            # Bytes fails on read_parquet
-            check_round_trip(df, pa)
-
-        # python object
-        df.columns = [
-            datetime.datetime(2011, 1, 1, 0, 0),
-            datetime.datetime(2011, 1, 1, 1, 1),
-        ]
+        df.columns = columns
         check_round_trip(df, pa)
 
     def test_empty_columns(self, pa):

From dd1676fb9d51d52a30187788a59d879f4aaa174a Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Mon, 3 Mar 2025 16:00:40 -0800
Subject: [PATCH 2/2] remove xfail

---
 pandas/tests/io/test_parquet.py | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py
index c8c041901db3d..45aed8df6d416 100644
--- a/pandas/tests/io/test_parquet.py
+++ b/pandas/tests/io/test_parquet.py
@@ -19,7 +19,6 @@
     pa_version_under11p0,
     pa_version_under13p0,
     pa_version_under15p0,
-    pa_version_under17p0,
     pa_version_under19p0,
     pa_version_under20p0,
 )
@@ -1117,16 +1116,10 @@ def test_read_dtype_backend_pyarrow_config_index(self, pa):
                     reason="https://github.com/apache/arrow/pull/44171",
                 ),
             ),
-            pytest.param(
-                [
-                    datetime.datetime(2011, 1, 1, 0, 0),
-                    datetime.datetime(2011, 1, 1, 1, 1),
-                ],
-                marks=pytest.mark.xfail(
-                    pa_version_under17p0,
-                    reason="pa.pandas_compat passes 'datetime64' to .astype",
-                ),
-            ),
+            [
+                datetime.datetime(2011, 1, 1, 0, 0),
+                datetime.datetime(2011, 1, 1, 1, 1),
+            ],
         ],
     )
     def test_columns_dtypes_not_invalid(self, pa, columns):