From 8de0b712b3a7d39eb825d2e00a84bea460ae6af4 Mon Sep 17 00:00:00 2001
From: Larry Gritz <lg@larrygritz.com>
Date: Sun, 8 Sep 2024 11:23:33 -0700
Subject: [PATCH] try always installing python3-numpy

Signed-off-by: Larry Gritz <lg@larrygritz.com>
---
 .github/workflows/ci.yml              |  5 ++---
 src/build-scripts/gh-installdeps.bash | 25 ++++++-------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc57920836..c9b8a98006 100644
--- 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
@@ -350,7 +350,6 @@ jobs:
                             OIIO_CMAKE_FLAGS="-DFORTIFY_SOURCE=2"
                             QT_VERSION=6
                             EXTRA_DEP_PACKAGES="python3.12-dev python3-numpy"
-                            PIP_INSTALLS="none"
                             USE_OPENVDB=0
                             SKIP_APT_GET_UPDATE=1
                             FREETYPE_VERSION=master
diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash
index c27dbe0e7a..9d5da814cb 100755
--- a/src/build-scripts/gh-installdeps.bash
+++ b/src/build-scripts/gh-installdeps.bash
@@ -108,11 +108,12 @@ else
     fi
 
     # Nonstandard python versions
-    if [[ "${PYTHON_VERSION}" == "3.9" ]] ; then
-        time sudo apt-get -q install -y python3.9-dev python3-numpy
-        pip3 --version
-    fi
-    if [[ "${PIP_INSTALLS:=numpy}" != "none" ]] ; then
+    # if [[ "${PYTHON_VERSION}" == "3.9" ]] ; then
+    #     time sudo apt-get -q install -y python3.9-dev python3-numpy
+    #     pip3 --version
+    # fi
+    time sudo apt-get -q install -y python3-numpy
+    if [[ "${PIP_INSTALLS}" != "" ]] ; then
         time pip3 install ${PIP_INSTALLS}
     fi
 
@@ -126,20 +127,6 @@ else
 
     export CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu:$CMAKE_PREFIX_PATH
 
-    # if [[ "$CXX" == "g++-9" ]] ; then
-    #     time sudo apt-get install -y g++-9
-    # elif [[ "$CXX" == "g++-10" ]] ; then
-    #     time sudo apt-get install -y g++-10
-    # elif [[ "$CXX" == "g++-11" ]] ; then
-    #     time sudo apt-get install -y g++-11
-    # elif [[ "$CXX" == "g++-12" ]] ; then
-    #     time sudo apt-get install -y g++-12
-    # elif [[ "$CXX" == "g++-13" ]] ; then
-    #     time sudo apt-get install -y g++-13
-    # elif [[ "$CXX" == "g++-14" ]] ; then
-    #     time sudo apt-get install -y g++-14
-    # fi
-
     if [[ "$CXX" == "icpc" || "$CC" == "icc" || "$USE_ICC" != "" || "$USE_ICX" != "" ]] ; then
         time sudo apt-get -q install -y wget
         wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB