Merge branch 'master' into openexr-luminance-chroma

Author: jreichel-nvidia

.clang-format

@@ -121,7 +121,7 @@ SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        c++14
+Standard:        c++17
 StatementMacros: 
   - Q_UNUSED
   - QT_REQUIRE_VERSION

.github/workflows/analysis.yml

@@ -43,30 +43,28 @@ jobs:
           - desc: sonar gcc9/C++14 py39 boost1.76 exr3.1 ocio2.2
             nametag: static-analysis-sonar
             os: ubuntu-latest
-            vfxyear: 2022
-            vfxsuffix: -clang11
-            cxx_std: 14
-            python_ver: 3.9
+            container: aswf/ci-osl:2023-clang15
+            vfxyear: 2023
+            cxx_std: 17
+            python_ver: "3.10"
             simd: "avx2,f16c"
-            fmt_ver: 8.1.1
-            pybind11_ver: v2.9.0
+            fmt_ver: 10.1.1
+            pybind11_ver: v2.10.0
             coverage: 1
             # skip_tests: 1
             sonar: 1
-            setenvs: export SONAR_SCANNER_VERSION=4.7.0.2747
-                            SONAR_SERVER_URL="https://sonarcloud.io"
-                            BUILD_WRAPPER_OUT_DIR=bw_output
-                            OIIO_CMAKE_BUILD_WRAPPER="build-wrapper-linux-x86-64 --out-dir bw_output"
+            setenvs: export SONAR_SERVER_URL="https://sonarcloud.io"
+                            BUILD_WRAPPER_OUT_DIR=/__w/OpenImageIO/OpenImageIO/bw_output
+                            OIIO_CMAKE_BUILD_WRAPPER="build-wrapper-linux-x86-64 --out-dir /__w/OpenImageIO/OpenImageIO/bw_output"
                             CMAKE_BUILD_TYPE=Debug
                             CMAKE_UNITY_BUILD=OFF
                             CODECOV=1
                             CTEST_TEST_TIMEOUT=1200
                             OIIO_CMAKE_FLAGS="-DOIIO_TEX_IMPLEMENT_VARYINGREF=OFF"
-                            OPENCOLORIO_VERSION=v2.2.0
 
     runs-on: ${{ matrix.os }}
     container:
-      image: aswf/ci-osl:${{matrix.vfxyear}}${{matrix.vfxsuffix}}
+      image: ${{ matrix.container }}
     env:
       CXX: ${{matrix.cxx_compiler}}
       CC: ${{matrix.cc_compiler}}
@@ -106,6 +104,9 @@ jobs:
         run: |
             ${{matrix.depcmds}}
             src/build-scripts/gh-installdeps.bash
+      - name:  Install sonar-scanner and build-wrapper
+        if: matrix.sonar == '1'
+        uses: sonarsource/sonarcloud-github-c-cpp@e4882e1621ad2fb48dddfa48287411bed34789b1 # v2.0.2
       - name: Build
         run: src/build-scripts/ci-build.bash
       - name: Testsuite
@@ -120,7 +121,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-            sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="build/bw_output" --define sonar.cfamily.gcov.reportsPath="_coverage"
+            which sonar-scanner
+            ls -l /__w/OpenImageIO/OpenImageIO/bw_output
+            echo "BUILD_OUTPUT_DIR is " "${{ env.BUILD_WRAPPER_OUT_DIR }}"
+            find . -name "*.gcov" -print
+            # sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+            sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="$BUILD_WRAPPER_OUT_DIR" --define sonar.cfamily.gcov.reportsPath="_coverage" --define sonar.cfamily.threads="$PARALLEL"
+        # Consult https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-cli/ for more information and options
+
       # - uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
       #   if: failure()
       #   with:

.github/workflows/ci.yml

@@ -10,6 +10,8 @@ on:
     paths-ignore:
       - '**.md'
       - '**.rst'
+      - '**.analysis.yml'
+      - '**.properties'
   pull_request:
     paths-ignore:
       - '**.md'
@@ -171,21 +173,6 @@ jobs:
                              USE_OPENCV=0
             depcmds: sudo rm -rf /usr/local/include/OpenEXR
 
-          # Test formatting. This test entry doesn't do a full build, 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
-            container: aswf/ci-osl:2022-clang12
-            vfxyear: 2022
-            cxx_std: 17
-            skip_tests: 1
-            setenvs: export BUILDTARGET=clang-format
-                            OIIO_CMAKE_FLAGS=-DUSE_PYTHON=0
-
           # Test ABI stability. `abi_check` is the version or commit that we
           # believe is the current standard against which we don't want to
           # break the ABI. Basically, we will build that version as well as
@@ -387,6 +374,22 @@ jobs:
             depcmds: |
               sudo rm -rf /usr/local/include/OpenEXR
               sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}
+          # Test formatting. This test entry doesn't do a full build, 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
+            cxx_std: 17
+            extra_artifacts: "src/*.*"
+            python_ver: "3.10"
+            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
 
     runs-on: ${{ matrix.runner }}
     env:
@@ -437,6 +440,7 @@ jobs:
           path: |
             build/cmake-save
             build/testsuite/*/*.*
+            ${{ matrix.extra_artifacts }}
             !build/testsuite/oiio-images
             !build/testsuite/openexr-images
             !build/testsuite/fits-images

.github/workflows/macarm.yml

@@ -25,8 +25,7 @@ on:
       - 'release'
   # Run for pull requests whose branch name includes "macarm" (this allows
   # us to test specific PRs that we think need ARM verification).
-  pull_request:
-    if: contains(github.head_ref, 'macarm')
+  pull_request: {}
   # Run monthly on the 27th (a few days before patch releases) to make sure we
   # haven't broken anything among the many PRs that didn't test on ARM.
   schedule:
@@ -42,7 +41,9 @@ jobs:
   macos-arm:
     name: "${{matrix.os}} appleclang${{matrix.aclang}}/C++${{matrix.cxx_std}} py${{matrix.python_ver}} ${{matrix.desc}} boost1.76 exr3.1 ocio2.1"
     # Needs special runners, only run on the main repo,
-    if: github.repository == 'AcademySoftwareFoundation/OpenImageIO'
+    if: github.repository == 'AcademySoftwareFoundation/OpenImageIO' &&
+        ((github.event_name == 'pull_request' && contains(github.head_ref, 'macarm')) ||
+         (github.event_name == 'push' || github.event_name == 'schedule'))
     strategy:
       fail-fast: false
       matrix:

.github/workflows/release-notice.yml

@@ -19,5 +19,8 @@ jobs:
     - name: Notify Slack
       id: slack
       with:
-        slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_RELEASES_URL }}
-      uses: fedecalendino/slack-release-notifier@8329c1c2d20055ff874ce3eaed7021735d17069d # v2.1.0
+        project_name: "OpenImageIO"
+        slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
+        slack_channel: "#release-announcements"
+        project_logo: "https://artwork.aswf.io/projects/openimageio/icon/color/openimageio-icon-color.png"
+      uses: jmertic/slack-release-notifier@main

.mailmap

@@ -1 +1,71 @@
+# This file establishes email equivalences so we can resolve what look like
+# multiple authors, but actually are the same author who has used multiple
+# emails over the course of their involvement with the project.
+#
+# The format is any of the following:
+#     <CANONICAL-EMAIL> <alternate-email>
+#     CANONICAL-NAME <CANONICAL-EMAIL> <alternate-email>
+#     CANONICAL-NAME <CANONICAL-EMAIL> alternate-name <alternate-email>
+#
+# You can check for duplicates with this command:
+#     git shortlog -sne --all
+# That command (and others) will use this file to collapse the duplicates.
+#
+# If you see any duplicates we don't account for here, or if you look at your
+# own entry here and want a different name or email to be your canonical one
+# (we may not have guessed correctly and matched your preferences), please
+# file a PR with the edits to this file.
+
+Alejandro Conty <[email protected]> aconty <[email protected]>
+Alejandro Conty <[email protected]> Alejandro Conty <[email protected]>
+Anton Dukhovnikov <[email protected]> Anton Dukhovnikov <[email protected]>
+Brecht Van Lommel <[email protected]> <[email protected]>
+Brecht Van Lommel <[email protected]> Brecht Van Lommel <[email protected]>
+Brecht Van Lommel <[email protected]> [email protected] <[email protected]>
+Chris Kulla <[email protected]> <[email protected]>
+Chris Kulla <[email protected]> <[email protected]>
+Chris Kulla <[email protected]> Christopher Kulla <[email protected]>
+Chris Kulla <[email protected]> fpsunflower <[email protected]>
 Claire Foster <[email protected]> <[email protected]>
+Clément Champetier <[email protected]> Clement Champetier <[email protected]>
+Clifford Stein <[email protected]> Cliff Stein <[email protected]> 
+Clifford Stein <[email protected]> cmstein <[email protected]> 
+Dan Wexler <[email protected]> Dan Wexler <[email protected]>
+Dan Wexler <[email protected]> Dan Wexler <[email protected]>
+Edgar Velazquez-Armendariz <[email protected]> Edgar Velázquez-Armendáriz <[email protected]>
+Fabien Castan <[email protected]> Fabien Castan <[email protected]>
+Fabien Servant <[email protected]> Fabien Servant @ TCS <[email protected]>
+Frédéric Devernay <[email protected]> Frédéric Devernay <[email protected]>
+Harry Mallon <[email protected]> Harry Mallon <[email protected]>
+Henri Fousse <[email protected]> darkhorse64 <[email protected]>
+Jesse Yurkovich <[email protected]> Jesse Y <[email protected]>
+Larry Gritz <[email protected]> <[email protected]>
+Larry Gritz <[email protected]> lgritz <[email protected]>
+Leszek Godlewski <[email protected]> Leszek Godlewski <[email protected]>
+lmarz <[email protected]> lmarz <[email protected]>
+Mark Boorer <[email protected]> Mark Boorer <[email protected]>
+Mark Boorer <[email protected]> Shootfast <[email protected]>
+Mark Visser <[email protected]> Mark Visser <[email protected]>
+Matteo F. Vescovi <[email protected]> Matteo F. Vescovi <[email protected]>
+Matteo F. Vescovi <[email protected]> Matteo F. Vescovi <[email protected]>
+Mikael Sundell <[email protected]> Mikael Sundell <[email protected]>
+Nathan Rusch <[email protected]> Nathan Rusch <[email protected]>
+Nick Black <[email protected]> nick black <[email protected]>
+Nick Black <[email protected]> Nick Black <[email protected]>
+Pascal Lecocq <[email protected]> Pascal Lecocq <[email protected]>
+Ramon Montoya <[email protected]> Ramon Montoya Vozmediano <[email protected]>
+Ramon Montoya <[email protected]> rmv <[email protected]>
+Ray Molenkamp <[email protected]> Ray Molenkamp <[email protected]>
+Richard M. Shaw <[email protected]> Richard <[email protected]>
+Richard M. Shaw <[email protected]> Richard Shaw <[email protected]>
+Robert Matusewicz <[email protected]> matekm <[email protected]> 
+Robert Matusewicz <[email protected]> Robert <[email protected]>
+Roman Zulak <[email protected]> marsupial <[email protected]>
+Sam Richards <[email protected]> Sam Richards <[email protected]>
+Shane Ambler <[email protected]> sambler <[email protected]>
+Shane Ambler <[email protected]> SAmbler <[email protected]>
+Simon Boorer <[email protected]> Simon Boorer <[email protected]>
+Thiago Ize <[email protected]> Thiago Ize <[email protected]>
+Vlad (Kuzmin) Erium <[email protected]> Vlad (Kuzmin) Erium <[email protected]>
+Will Rosecrans <[email protected]> Will <[email protected]>
+Yang Yang <[email protected]> YangYangTL <[email protected]>