try always installing python3-numpy

Signed-off-by: Larry Gritz <lg@larrygritz.com>
lgritz · Sep 8, 2024 · 9ed25b6 · 9ed25b6
1 parent 23ce996
commit 9ed25b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -308,7 +308,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - desc: latest releases gcc13 C++20 py3.10 avx2 exr3.2 ocio2.3
+          - desc: latest releases gcc13 C++20 py3.12 avx2 exr3.2 ocio2.3
             nametag: linux-latest-releases
             runner: ubuntu-24.04
             cc_compiler: gcc-13
@@ -318,7 +318,7 @@ jobs:
             opencolorio_ver: v2.3.2
             openexr_ver: v3.2.4
             pybind11_ver: v2.13.5
-            python_ver: "3.10"
+            python_ver: "3.12"
             simd: avx2,f16c
             setenvs: export LIBJPEGTURBO_VERSION=3.0.3
                             LIBRAW_VERSION=0.21.2
@@ -328,6 +328,7 @@ jobs:
                             PUGIXML_VERSION=v1.14
                             WEBP_VERSION=v1.4.0
                             FREETYPE_VERSION=VER-2-13-3
+                            EXTRA_DEP_PACKAGES="python3.12-dev"
           - desc: bleeding edge gcc14 C++20 py3.12 OCIO/libtiff/exr-master avx2
             nametag: linux-bleeding-edge
             runner: ubuntu-24.04

diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash
@@ -112,7 +112,8 @@ else
         time sudo apt-get -q install -y python3.9-dev python3-numpy
         pip3 --version
     fi
-    if [[ "${PIP_INSTALLS:=numpy}" != "none" ]] ; then
+    time sudo apt-get -q install -y python3-numpy
+    if [[ "${PIP_INSTALLS:=none}" != "none" ]] ; then
         time pip3 install ${PIP_INSTALLS}
     fi