From 20c48bb73c2b427b18e9448d6d6e839c90798fec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Mon, 31 May 2021 11:38:27 +0200
Subject: [PATCH] [BEAM-12423] Upgrade pyarrow to support version 4.0.0 too

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

diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 196361db796d..5dbbfae4f58f 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -147,7 +147,7 @@ def get_version():
     'pymongo>=3.8.0,<4.0.0',
     'oauth2client>=2.0.1,<5',
     'protobuf>=3.12.2,<4',
-    'pyarrow>=0.15.1,<4.0.0',
+    'pyarrow>=0.15.1,<5.0.0',
     'pydot>=1.2.0,<2',
     'python-dateutil>=2.8.0,<3',
     'pytz>=2018.3',
diff --git a/sdks/python/test-suites/tox/common.gradle b/sdks/python/test-suites/tox/common.gradle
index 15c4255a7757..af74725bfe5f 100644
--- a/sdks/python/test-suites/tox/common.gradle
+++ b/sdks/python/test-suites/tox/common.gradle
@@ -35,7 +35,7 @@ project.task("preCommitPy${pythonVersionSuffix}") {
       if (pythonVersionSuffix.equals('38')) {
           dependsOn = ["testPy38CloudCoverage", "testPy38Cython",
               "testPy38pyarrow-0", "testPy38pyarrow-1", "testPy38pyarrow-2",
-              "testPy38pyarrow-3"]
+              "testPy38pyarrow-3", "testPy38pyarrow-4"]
       } else {
           dependsOn = ["testPy${pythonVersionSuffix}Cloud", "testPy${pythonVersionSuffix}Cython"]
       }
diff --git a/sdks/python/test-suites/tox/py38/build.gradle b/sdks/python/test-suites/tox/py38/build.gradle
index 9fd93843f867..8497d573bc68 100644
--- a/sdks/python/test-suites/tox/py38/build.gradle
+++ b/sdks/python/test-suites/tox/py38/build.gradle
@@ -38,10 +38,12 @@ toxTask "testPy38pyarrow-0", "py38-pyarrow-0"
 toxTask "testPy38pyarrow-1", "py38-pyarrow-1"
 toxTask "testPy38pyarrow-2", "py38-pyarrow-2"
 toxTask "testPy38pyarrow-3", "py38-pyarrow-3"
+toxTask "testPy38pyarrow-4", "py38-pyarrow-4"
 test.dependsOn "testPy38pyarrow-0"
 test.dependsOn "testPy38pyarrow-1"
 test.dependsOn "testPy38pyarrow-2"
 test.dependsOn "testPy38pyarrow-3"
+test.dependsOn "testPy38pyarrow-4"
 
 toxTask "whitespacelint", "whitespacelint"
 
diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini
index 5489f36ed43f..a5137fdafd6e 100644
--- a/sdks/python/tox.ini
+++ b/sdks/python/tox.ini
@@ -228,7 +228,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}-pyarrow-{0,1,2,3}]
+[testenv:py{36,37,38}-pyarrow-{0,1,2,3,4}]
 deps =
   0: pyarrow>=0.15.1,<0.18.0
   1: pyarrow>=1,<2
@@ -237,6 +237,7 @@ deps =
   # pyarrow <3 doesn't work with 1.20.0, but doesn't restrict the bounds
   {0,1,2}: numpy<1.20.0
   3: pyarrow>=3,<4
+  4: pyarrow>=4,<5
 commands =
   # Log pyarrow and numpy version for debugging
   /bin/sh -c "pip freeze | grep -E '(pyarrow|numpy)'"