From 95f076e010bb5013487bad33f4e721a7ff2d2c65 Mon Sep 17 00:00:00 2001
From: Christopher Neffshade <caneff@google.com>
Date: Tue, 26 Sep 2023 18:33:39 +0000
Subject: [PATCH] Fix pyarrow tests for pandas 2 compat

---
 sdks/python/tox.ini | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini
index 9aeaded00d13..a1bbc8001f51 100644
--- a/sdks/python/tox.ini
+++ b/sdks/python/tox.ini
@@ -177,7 +177,7 @@ deps =
   holdup==1.8.0
 extras =
   gcp
-allowlist_externals = 
+allowlist_externals =
   bash
   echo
   sleep
@@ -210,7 +210,7 @@ deps =
 extras =
   azure
 passenv = REQUESTS_CA_BUNDLE
-allowlist_externals = 
+allowlist_externals =
   wget
   az
   bash
@@ -286,12 +286,22 @@ extras = test
 commands =
   bash {toxinidir}/scripts/pytest_validates_runner.sh {envname} {toxinidir}/apache_beam/runners/portability/spark_runner_test.py {posargs}
 
+
 [testenv:py{38,39,310}-pyarrow-{3,4,5,6,7,8,9}]
 deps =
-  3: pyarrow>=3,<4
-  4: pyarrow>=4,<5
-  5: pyarrow>=5,<6
-  6: pyarrow>=6,<7
+  # Pandas 2 minimum for pyarrow is 7
+  3:
+    pyarrow>=3,<4
+    pandas<2
+  4:
+    pyarrow>=4,<5
+    pandas<2
+  5:
+    pyarrow>=5,<6
+    pandas<2
+  6:
+    pyarrow>=6,<7
+    pandas<2
   7: pyarrow>=7,<8
   8: pyarrow>=8,<9
   9: pyarrow>=9,<10