Merge remote-tracking branch 'upstream/master' into OpenEXR_copyimage_impl

Author: tkchanat

.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

.git-blame-ignore-revs

@@ -36,3 +36,7 @@ f701a76b745b6ddba41c77b24a1ea7e1f48ae0b4
 # clang-format: Adjust alignment of line continuation backslashes (#2664)
 742173e39588e07cf43cbe7b49dd22d624a48388
 d8810c5365ea88e2b1bce6155b7b495c18f2f9bc
+
+# style: update our formatting standard to clang-format 17.0 and C++17 (#4096)
+c618d45e13dcc382fb07a948be84b8074d1ed481
+b88b82ffe9b3c4fcf04bf17bacc4ee77b2d1ed92

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,29 +8,40 @@ assignees: ''
 ---
 
 **Describe the bug**
+
 A clear and concise description of what the bug is. What happened, and
 what did you expect to happen instead.
 
+
+**OpenImageIO version and dependencies**
+
+Please run `oiiotool --buildinfo` and paste the output here.
+
+Also please tell us if there was anything unusual about your environment or
+nonstandard build options you used.
+
+
 **To Reproduce**
+
 Steps to reproduce the behavior:
 1. Do this...
 2. Then this...
 3. Then THIS happens (reproduce the exact error message if you can)
+4. Whereas I expected this other specific thing to happen instead.
+
+If the problem occurs in your C++ or Python code that uses the OIIO APIs, can
+you also reproduce the problem using oiiotool? If so, please describe the
+exact command line that reproduces the problem. (Being able to reproduce the
+problem using only OIIO components makes it a lot easier for the developers
+investigate and makes it clear it's not your application's fault.)
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
 
 **Evidence**
-Do you have error messages? (please quote exactly) Screenshots? Example
-command lines or scripts that reliably reproduce the error? If it only
-happens with certain image files, can you attach the smallest image you
-can make that reproduces the problem?
-
-**Platform information:**
- - OIIO branch/version:
- - OS:
- - C++ compiler:
- - Any non-default build flags when you build OIIO:
+
+- Error messages (paste them here exactly)
+- Screenshots (if helpful)
+- Example input: If the problem only happens with certain image files, please
+  attach the smallest image you can make that reproduces the problem.
 
 
 **IF YOU ALREADY HAVE A CODE FIX:** There is no need to file a separate issue,

.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}}
@@ -85,15 +83,15 @@ 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@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: '0'
       - name: Prepare ccache timestamp
         id: ccache_cache_keys
-        run: echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+        run: echo "date=`date -u +'%Y-%m-%dT%H:%M:%SZ'`" >> $GITHUB_OUTPUT
       - name: ccache
         id: ccache
-        uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # v3.0.4
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
           path: /tmp/ccache
           key: ${{github.job}}-${{matrix.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
@@ -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,8 +121,15 @@ 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"
-      # - uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+            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 }}"
+            time 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@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       #   if: failure()
       #   with:
       #     name: oiio-${{github.job}}-${{matrix.nametag}}