Update manylinux image tags; update numpy versions

apache · Oct 5, 2021 · 93fc1b7 · 93fc1b7
1 parent af016f3
commit 93fc1b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -754,7 +754,7 @@ services:
       args:
         arch_alias: ${ARCH_ALIAS}
         arch_short_alias: ${ARCH_SHORT_ALIAS}
-        base: quay.io/pypa/manylinux2010_${ARCH_ALIAS}:2020-12-03-912b0de
+        base: quay.io/pypa/manylinux2010_${ARCH_ALIAS}:2021-10-02-c0b46c3
         vcpkg: ${VCPKG}
         python: ${PYTHON}
       context: .
@@ -777,7 +777,7 @@ services:
       args:
         arch_alias: ${ARCH_ALIAS}
         arch_short_alias: ${ARCH_SHORT_ALIAS}
-        base:  quay.io/pypa/manylinux2014_${ARCH_ALIAS}:2020-11-11-bc8ce45
+        base:  quay.io/pypa/manylinux2014_${ARCH_ALIAS}:2021-10-02-c0b46c3
         vcpkg: ${VCPKG}
         python: ${PYTHON}
       context: .

diff --git a/python/requirements-wheel-build.txt b/python/requirements-wheel-build.txt
@@ -2,9 +2,11 @@ cython>=0.29.11
 setuptools>=58
 setuptools_scm
 wheel
-numpy==1.19.4; platform_system == "Linux"   and platform_machine == "aarch64"
+numpy==1.19.4; platform_system == "Linux"   and platform_machine == "aarch64" and python_version <= "3.9"
+numpy==1.21.2; platform_system == "Linux"   and platform_machine == "aarch64" and python_version >  "3.9"
 numpy==1.16.6; platform_system == "Linux"   and platform_machine != "aarch64" and python_version <  "3.9"
-numpy==1.19.4; platform_system == "Linux"   and platform_machine != "aarch64" and python_version >= "3.9"
+numpy==1.19.4; platform_system == "Linux"   and platform_machine != "aarch64" and python_version == "3.9"
+numpy==1.21.2; platform_system == "Linux"   and platform_machine != "aarch64" and python_version >  "3.9"
 numpy==1.21.0; platform_system == "Darwin"  and platform_machine == "arm64"
 numpy==1.16.6; platform_system == "Darwin"  and platform_machine != "arm64"   and python_version <  "3.8"
 numpy==1.19.4; platform_system == "Darwin"  and platform_machine != "arm64"   and python_version >= "3.8"

diff --git a/python/requirements-wheel-test.txt b/python/requirements-wheel-test.txt
@@ -7,14 +7,14 @@ pytest-lazy-fixture
 pytz
 
 numpy==1.19.5; platform_system == "Linux"   and platform_machine == "aarch64" and python_version <  "3.7"
-numpy==1.20.3; platform_system == "Linux"   and platform_machine == "aarch64" and python_version >= "3.7"
+numpy==1.21.2; platform_system == "Linux"   and platform_machine == "aarch64" and python_version >= "3.7"
 numpy==1.19.5; platform_system == "Linux"   and platform_machine != "aarch64" and python_version <  "3.9"
-numpy==1.20.3; platform_system == "Linux"   and platform_machine != "aarch64" and python_version >= "3.9"
-numpy==1.21.0; platform_system == "Darwin"  and platform_machine == "arm64"
+numpy==1.21.2; platform_system == "Linux"   and platform_machine != "aarch64" and python_version >= "3.9"
+numpy==1.21.2; platform_system == "Darwin"  and platform_machine == "arm64"
 numpy==1.19.5; platform_system == "Darwin"  and platform_machine != "arm64"   and python_version <  "3.9"
-numpy==1.20.3; platform_system == "Darwin"  and platform_machine != "arm64"   and python_version >= "3.9"
+numpy==1.21.2; platform_system == "Darwin"  and platform_machine != "arm64"   and python_version >= "3.9"
 numpy==1.19.5; platform_system == "Windows"                                   and python_version <  "3.9"
-numpy==1.20.3; platform_system == "Windows"                                   and python_version >= "3.9"
+numpy==1.21.2; platform_system == "Windows"                                   and python_version >= "3.9"
 
 pandas<1.1.0;  platform_system == "Linux"   and platform_machine != "aarch64" and python_version <  "3.8"
 pandas;        platform_system == "Linux"   and platform_machine != "aarch64" and python_version >= "3.8"