From 6c21f0e3d15d76d60a101df98f566bc27b0444a3 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 9 Dec 2020 10:49:17 +0100 Subject: [PATCH 1/2] ARROW-10861: [Python] Update minimal NumPy version to 1.16.6 --- ci/conda_env_python.yml | 2 +- python/pyproject.toml | 6 ++---- python/requirements-build.txt | 2 +- python/requirements-wheel-build.txt | 6 ++---- python/requirements-wheel-test.txt | 5 +---- python/setup.py | 2 +- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ci/conda_env_python.yml b/ci/conda_env_python.yml index f2f46c84436..9124c7e84ec 100644 --- a/ci/conda_env_python.yml +++ b/ci/conda_env_python.yml @@ -22,7 +22,7 @@ cython cloudpickle fsspec hypothesis -numpy>=1.14 +numpy>=1.16.6 pytest pytest-faulthandler pytest-lazy-fixture diff --git a/python/pyproject.toml b/python/pyproject.toml index 7c5b3d7c13b..71e837088d1 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -18,10 +18,8 @@ [build-system] requires = [ "cython >= 0.29", - "numpy==1.14.5; python_version<'3.7'", - "numpy==1.16.0; python_version=='3.7'", - "numpy==1.17.3; python_version=='3.8'", - "numpy==1.19.3; python_version>='3.9'", + "numpy==1.16.6; python_version<='3.8'", + "numpy==1.19.4; python_version>='3.9'", "setuptools", "setuptools_scm", "wheel" diff --git a/python/requirements-build.txt b/python/requirements-build.txt index eb241a867d4..02539419286 100644 --- a/python/requirements-build.txt +++ b/python/requirements-build.txt @@ -1,4 +1,4 @@ cython>=0.29 -numpy>=1.14 +numpy>=1.16.6 setuptools>=38.6.0 setuptools_scm diff --git a/python/requirements-wheel-build.txt b/python/requirements-wheel-build.txt index df25aeb3043..457dea387b7 100644 --- a/python/requirements-wheel-build.txt +++ b/python/requirements-wheel-build.txt @@ -1,7 +1,5 @@ cython>=0.29.11 -numpy==1.14.5; python_version < "3.7" -numpy==1.16.0; python_version == "3.7" -numpy==1.17.3; python_version == "3.8" -numpy==1.19.3; python_version >= "3.9" +numpy==1.16.6; python_version < "3.9" +numpy==1.19.4; python_version >= "3.9" setuptools_scm wheel diff --git a/python/requirements-wheel-test.txt b/python/requirements-wheel-test.txt index 3980362518c..a532a27fe89 100644 --- a/python/requirements-wheel-test.txt +++ b/python/requirements-wheel-test.txt @@ -1,10 +1,7 @@ cffi cython hypothesis -numpy==1.14.5; python_version < "3.7" -numpy==1.16.0; python_version == "3.7" -numpy==1.17.3; python_version == "3.8" -numpy==1.19.3; python_version >= "3.9" +numpy==1.19.4 pandas<1.1.0; python_version < "3.8" pandas; python_version >= "3.8" pickle5; python_version == "3.6" or python_version == "3.7" diff --git a/python/setup.py b/python/setup.py index 5238ace6689..853ef18b204 100755 --- a/python/setup.py +++ b/python/setup.py @@ -572,7 +572,7 @@ def has_ext_modules(foo): install_requires = ( - 'numpy >= 1.14', + 'numpy >= 1.16.6', ) From 4fe319c6f135da5f6691babcf4b12512bfb04b98 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 10 Dec 2020 11:06:10 +0100 Subject: [PATCH 2/2] Update python/pyproject.toml Co-authored-by: Joris Van den Bossche --- python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 71e837088d1..37a03e989d4 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -18,7 +18,7 @@ [build-system] requires = [ "cython >= 0.29", - "numpy==1.16.6; python_version<='3.8'", + "numpy==1.16.6; python_version<'3.9'", "numpy==1.19.4; python_version>='3.9'", "setuptools", "setuptools_scm",