Merge branch 'AcademySoftwareFoundation:main' into R3D

Author: 1div0

.gitattributes

@@ -0,0 +1,11 @@
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: Apache-2.0
+# https://github.com/AcademySoftwareFoundation/OpenImageIO
+
+# Helpful documentation:
+# - https://github.com/github-linguist/linguist/blob/main/docs/overrides.md
+# - https://github.com/github-linguist/linguist/blob/main/docs/troubleshooting.md
+
+
+*.h linguist-language=C++
+src/libOpenImageIO/bluenoise.inc -linguist-detectable

.github/workflows/analysis.yml

@@ -24,6 +24,7 @@ on:
       - '!**/ci.yml'
       - '!**/docs.yml'
       - '!**/scorecard.yml'
+      - '!**/wheel.yml'
       - '!**.properties'
       - '!docs/**'
   # Run analysis on PRs only if the branch name indicates that the purpose of

.github/workflows/build-steps.yml

@@ -52,6 +52,8 @@ on:
         type: string
       build_docs:
         type: string
+      clang_format:
+        type: string
       generator:
         type: string
       ctest_args:
@@ -100,7 +102,8 @@ jobs:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Checkout repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: '0'
       - name: Prepare ccache timestamp
@@ -144,6 +147,10 @@ jobs:
         if: inputs.skip_tests != '1'
         shell: bash
         run: src/build-scripts/ci-test.bash
+      - name: clang-format
+        if: inputs.clang_format == '1'
+        shell: bash
+        run: src/build-scripts/run-clang-format.bash
       - name: Code coverage
         if: inputs.coverage == '1'
         run: src/build-scripts/ci-coverage.bash
@@ -186,7 +193,8 @@ jobs:
             cd src/doc
             time make doxygen
             time make sphinx
-      - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+      - name: Upload testsuite debugging artifacts
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         if: ${{ failure() || inputs.build_docs == '1'}}
         with:
           name: oiio-${{github.job}}-${{inputs.nametag}}

.github/workflows/ci.yml

@@ -14,6 +14,7 @@ on:
       - '!**/analysis.yml'
       - '!**/docs.yml'
       - '!**/scorecard.yml'
+      - '!**/wheel.yml'
       - '!**.properties'
       - '!docs/**'
   pull_request:
@@ -56,7 +57,7 @@ jobs:
             setenvs: export PUGIXML_VERSION=v1.9 WEBP_VERSION=v1.1.0 USE_OPENVDB=0
                             FREETYPE_VERSION=VER-2-10-0
           - desc: VP2021 clang10/C++17 avx2 exr3.1 ocio2.0
-            nametag: linux-clang10-cpp14
+            nametag: linux-vfx2021.clang10.cpp14
             runner: ubuntu-latest
             container: aswf/ci-osl:2021-clang10
             vfxyear: 2021
@@ -84,7 +85,7 @@ jobs:
             pybind11_ver: v2.9.0
             setenvs: export FREETYPE_VERSION=VER-2-12-0
           - desc: VP2022 clang13/C++17 py39 avx2 exr3.1 ocio2.1
-            nametag: linux-vfx2022-clang13
+            nametag: linux-vfx2022.clang13
             runner: ubuntu-latest
             container: aswf/ci-osl:2022-clang13
             vfxyear: 2022
@@ -173,7 +174,8 @@ jobs:
       #   uses: step-security/harden-runner@248ae51c2e8cc9622ecf50685c8bf7150c6e8813 # v1.4.3
       #   with:
       #     egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Checkout repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: '0'
       - name: Prepare ccache timestamp
@@ -223,7 +225,8 @@ jobs:
             cd src/doc
             time make doxygen
             time make sphinx
-      - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+      - name: Upload testsuite debugging artifacts
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         if: ${{ failure() || matrix.build_docs == '1'}}
         with:
           name: oiio-${{github.job}}-${{matrix.nametag}}
@@ -267,6 +270,7 @@ jobs:
       skip_tests: ${{ matrix.skip_tests }}
       abi_check: ${{ matrix.abi_check }}
       build_docs: ${{ matrix.build_docs }}
+      clang_format: ${{ matrix.clang_format }}
       generator: ${{ matrix.generator }}
       ctest_args: ${{ matrix.ctest_args }}
       ctest_test_timeout: ${{ matrix.ctest_test_timeout }}
@@ -286,7 +290,7 @@ jobs:
             pybind11_ver: v2.10.0
             setenvs: PUGIXML_VERSION=v1.13
           - desc: VFX2023 icc/C++17 py3.10 exr3.1 ocio2.1 qt5.15
-            nametag: linux-vfx2023-icc
+            nametag: linux-vfx2023.icc
             runner: ubuntu-latest
             container: aswf/ci-osl:2023
             opencolorio_ver: v2.2.1
@@ -302,7 +306,7 @@ jobs:
             # For icc, use fp-model precise to eliminate needless LSB errors
             # that make test results differ from other platforms.
           - desc: VFX2023 icx/C++17 py3.10 exr3.1 ocio2.2 qt5.15
-            nametag: linux-vfx2023-icx
+            nametag: linux-vfx2023.icx
             runner: ubuntu-latest
             container: aswf/ci-osl:2023
             cc_compiler: icx
@@ -326,7 +330,7 @@ jobs:
             pybind11_ver: v2.12.0
             setenvs: PUGIXML_VERSION=v1.14
           - desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3
-            nametag: linux-vfx2024
+            nametag: linux-vfx2024.clang
             runner: ubuntu-latest
             container: aswftesting/ci-osl:2024-clang17
             cc_compiler: clang
@@ -367,24 +371,25 @@ jobs:
             setenvs: export OIIO_CMAKE_FLAGS="-DOIIO_BUILD_TOOLS=0 -DOIIO_BUILD_TESTS=0 -DUSE_PYTHON=0"
                             USE_OPENCV=0 USE_FFMPEG=0 USE_PYTHON=0 USE_FREETYPE=0
 
-          # Test formatting. This test entry doesn't do a full build, it
+          # Test formatting. This test entry doesn't build at all, it
           # just runs clang-format on everything, and passes if nothing is
           # misformatted. Upon failure, the build artifact will be the full
           # source code with the formatting fixed (diffs will also appear in
           # the console output).
           - desc: "clang-format"
             nametag: clang-format
-            runner: ubuntu-latest
+            runner: ubuntu-24.04
             cxx_std: 17
             extra_artifacts: "src/*.*"
-            openexr_ver: v3.1.13
             python_ver: "3.10"
+            pybind11_ver: "0"
+            clang_format: 1
+            skip_build: 1
             skip_tests: 1
-            setenvs: export BUILDTARGET=clang-format
-                            OIIO_CMAKE_FLAGS=-DUSE_PYTHON=0
-                            LLVM_VERSION=17.0.6 LLVM_DISTRO_NAME=ubuntu-22.04
-                            SKIP_SYSTEM_DEPS_INSTALL=1 QT_VERSION=0
-                            OpenImageIO_OPTIONAL_DEPS=ALL
+            setenvs: export SKIP_SYSTEM_DEPS_INSTALL=1 SKIP_APT_GET_UPDATE=1
+                            INSTALL_OPENCV=0 QT_VERSION=0 USE_LIBHEIF=0
+                            EXTRA_DEP_PACKAGES="clang-format-17"
+                            CLANG_FORMAT_EXE=clang-format-17
 
           - desc: latest releases gcc13 C++20 py3.12 avx2 exr3.3 ocio2.4
             nametag: linux-latest-releases
@@ -453,40 +458,37 @@ jobs:
                             PUGIXML_VERSION=v1.14
                             WEBP_VERSION=v1.4.0
 
-          - desc: clang14 C++20 avx2 exr3.1 ocio2.1
+          - desc: clang15 C++17 avx2 exr3.1 ocio2.2
             nametag: linux-clang14
-            runner: ubuntu-20.04
-            cxx_compiler: clang++
-            cc_compiler: clang
-            cxx_std: 20
+            runner: ubuntu-22.04
+            cxx_compiler: clang++-15
+            cc_compiler: clang-15
+            cxx_std: 17
             fmt_ver: 10.1.1
             opencolorio_ver: v2.2.1
             openexr_ver: v3.1.13
             pybind11_ver: v2.12.0
-            python_ver: 3.8
+            python_ver: "3.10"
             simd: avx2,f16c
-            setenvs: export LLVM_VERSION=14.0.0
-                            USE_OPENVDB=0
-                            # The installed OpenVDB has a TLS conflict with Python 3.8
           - desc: debug gcc9/C++17, sse4.2, exr3.1
             nametag: linux-gcc9-cpp17-debug
-            runner: ubuntu-20.04
+            runner: ubuntu-22.04
             cxx_compiler: g++-9
             cxx_std: 17
             build_type: Debug
-            python_ver: 3.8
+            python_ver: "3.10"
             simd: sse4.2
             openexr_ver: v3.1.13
             pybind11_ver: v2.7.0
             ctest_test_timeout: 1200
             setenvs: export PUGIXML_VERSION=v1.9
           - desc: static libs gcc9 C++17 exr3.1
             nametag: linux-static
-            runner: ubuntu-20.04
+            runner: ubuntu-22.04
             cxx_compiler: g++-9
             cxx_std: 17
             openexr_ver: v3.1.13
-            python_ver: 3.8
+            python_ver: "3.10"
             pybind11_ver: v2.7.0
             setenvs: export BUILD_SHARED_LIBS=OFF
             depcmds: |

.github/workflows/docs.yml

@@ -12,6 +12,7 @@ on:
       - '**/ci.yml'
       - '**/analysis.yml'
       - '**/scorecard.yml'
+      - '**/wheel.yml'
       - '**.properties'
       - 'src/**.cpp'
       - '**.cmake'
@@ -22,6 +23,7 @@ on:
       - '**/ci.yml'
       - '**/analysis.yml'
       - '**/scorecard.yml'
+      - '**/wheel.yml'
       - '**.properties'
       - 'src/**.cpp'
       - '**.cmake'
@@ -56,10 +58,6 @@ jobs:
       build_type: ${{ matrix.build_type || 'Release' }}
       depcmds: ${{ matrix.depcmds }}
       extra_artifacts: ${{ matrix.extra_artifacts }}
-      fmt_ver: ${{ matrix.fmt_ver }}
-      opencolorio_ver: ${{ matrix.opencolorio_ver }}
-      openexr_ver: ${{ matrix.openexr_ver }}
-      pybind11_ver: ${{ matrix.pybind11_ver }}
       python_ver: ${{ matrix.python_ver }}
       setenvs: ${{ matrix.setenvs }}
       simd: ${{ matrix.simd }}
@@ -68,10 +66,6 @@ jobs:
       abi_check: ${{ matrix.abi_check }}
       build_docs: ${{ matrix.build_docs }}
       generator: ${{ matrix.generator }}
-      ctest_args: ${{ matrix.ctest_args }}
-      ctest_test_timeout: ${{ matrix.ctest_test_timeout }}
-      coverage: ${{ matrix.coverage || '0' }}
-      sonar: ${{ matrix.sonar || '0' }}
 
     strategy:
       fail-fast: false
@@ -80,12 +74,13 @@ jobs:
           - desc: docs
             nametag: docslinux
             runner: ubuntu-latest
-            container: aswftesting/ci-openexr:2024
-            vfxyear: 2024
             cxx_std: 17
             python_ver: "3.11"
             build_docs: 1
             skip_build: 1
             skip_tests: 1
             setenvs: export EXTRA_DEP_PACKAGES="doxygen sphinx-doc"
-                            PIP_INSTALLS="sphinx breathe sphinx-tabs furo"
+                            PIP_INSTALLS="sphinx breathe==4.34.0 sphinx-tabs furo==2022.6.21"
+                            SKIP_SYSTEM_DEPS_INSTALL=1
+                            USE_OPENCV=0 USE_FFMPEG=0 USE_FREETYPE=0
+                            USE_LIBHEIF=0 QT_VERSION=0 PYBIND11_VERSION=0

.github/workflows/wheel.yml

@@ -268,6 +268,7 @@ jobs:
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
+          CMAKE_GENERATOR: "Unix Makefiles"
           # TODO: Re-enable HEIF when we provide a build recipe that does 
           # not include GPL-licensed dynamic libraries.
           USE_Libheif: 'OFF'
@@ -327,6 +328,7 @@ jobs:
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
+          CMAKE_GENERATOR: "Unix Makefiles"
 
       - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:

.gitignore

@@ -8,6 +8,7 @@ wheelhouse/
 _coverage/
 .python-version
 .idea
+.vs
 .vscode
 .cproject
 .project

INSTALL.md

@@ -40,7 +40,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
      * **pybind11 >= 2.7** (tested through 2.12)
      * NumPy
  * If you want support for PNG files:
-     * **libPNG >= 1.6.0** (tested though 1.6.43)
+     * **libPNG >= 1.6.0** (tested though 1.6.47)
  * If you want support for camera "RAW" formats:
      * **LibRaw >= 0.20** (tested though 0.21.3 and master)
  * If you want support for a wide variety of video formats:

pyproject.toml

@@ -29,6 +29,9 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 requires-python = ">= 3.8"
+dependencies = [
+    "numpy>=1.19",
+]
 
 [project.urls]
 Homepage = "https://openimageio.org/"

src/build-scripts/build_libpng.bash

@@ -10,8 +10,8 @@
 set -ex
 
 # Repo and branch/tag/commit of libpng to download if we don't have it yet
-LIBPNG_REPO=${LIBPNG_REPO:=https://github.com/glennrp/libpng.git}
-LIBPNG_VERSION=${LIBPNG_VERSION:=v1.6.35}
+LIBPNG_REPO=${LIBPNG_REPO:=https://github.com/pnggroup/libpng.git}
+LIBPNG_VERSION=${LIBPNG_VERSION:=v1.6.47}
 
 # Where to put libpng repo source (default to the ext area)
 LIBPNG_SRC_DIR=${LIBPNG_SRC_DIR:=${PWD}/ext/libpng}