From 9d39ff2d7549135cad5a9c86e9b33cb30dfe5e94 Mon Sep 17 00:00:00 2001
From: Brian Hulette <bhulette@google.com>
Date: Thu, 31 Mar 2022 09:58:10 -0700
Subject: [PATCH] Allow (and test) pyarrow 7

---
 sdks/python/setup.py                          | 2 +-
 sdks/python/test-suites/tox/py38/build.gradle | 4 ++++
 sdks/python/tox.ini                           | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 7c0776728e6c..658d5ec5b5ed 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -146,7 +146,7 @@ def get_version():
     'pymongo>=3.8.0,<4.0.0',
     'protobuf>=3.12.2,<4',
     'proto-plus>=1.7.1,<2',
-    'pyarrow>=0.15.1,<7.0.0',
+    'pyarrow>=0.15.1,<8.0.0',
     'pydot>=1.2.0,<2',
     'python-dateutil>=2.8.0,<3',
     'pytz>=2018.3',
diff --git a/sdks/python/test-suites/tox/py38/build.gradle b/sdks/python/test-suites/tox/py38/build.gradle
index 9a0605fac292..4992c8750bff 100644
--- a/sdks/python/test-suites/tox/py38/build.gradle
+++ b/sdks/python/test-suites/tox/py38/build.gradle
@@ -64,6 +64,10 @@ toxTask "testPy38pyarrow-6", "py38-pyarrow-6"
 test.dependsOn "testPy38pyarrow-6"
 preCommitPy38.dependsOn "testPy38pyarrow-6"
 
+toxTask "testPy38pyarrow-7", "py38-pyarrow-7"
+test.dependsOn "testPy38pyarrow-7"
+preCommitPy38.dependsOn "testPy38pyarrow-7"
+
 // Create a test task for each minor version of pandas
 toxTask "testPy38pandas-11", "py38-pandas-11"
 test.dependsOn "testPy38pandas-11"
diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini
index ae98280fd4b6..332e766d85b7 100644
--- a/sdks/python/tox.ini
+++ b/sdks/python/tox.ini
@@ -233,7 +233,7 @@ extras = test
 commands =
   {toxinidir}/scripts/pytest_validates_runner.sh {envname} {toxinidir}/apache_beam/runners/portability/spark_runner_test.py {posargs}
 
-[testenv:py{36,37,38,39}-pyarrow-{0,1,2,3,4,5,6}]
+[testenv:py{36,37,38,39}-pyarrow-{0,1,2,3,4,5,6,7}]
 deps =
   0: pyarrow>=0.15.1,<0.18.0
   1: pyarrow>=1,<2
@@ -245,6 +245,7 @@ deps =
   4: pyarrow>=4,<5
   5: pyarrow>=5,<6
   6: pyarrow>=6,<7
+  7: pyarrow>=7,<8
 commands =
   # Log pyarrow and numpy version for debugging
   /bin/sh -c "pip freeze | grep -E '(pyarrow|numpy)'"