AcademySoftwareFoundation · doug-walker · Nov 24, 2025 · Nov 24, 2025 · Nov 24, 2025 · Nov 24, 2025
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -459,7 +459,7 @@ jobs:
     if: |
       github.event_name == 'push' ||
       github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: macos-13
+    runs-on: macos-15-intel
     strategy:
       matrix:
         build: [1, 2, 3, 4, 5]

diff --git a/.github/workflows/wheel_workflow.yml b/.github/workflows/wheel_workflow.yml
@@ -101,10 +101,10 @@ jobs:
             manylinux: manylinux_2_28
             python: cp313-manylinux_x86_64
             arch: x86_64
-          # - build: CPython 3.14 64 bits manylinux_2_28
-          #   manylinux: manylinux_2_28
-          #   python: cp314-manylinux_x86_64
-          #   arch: x86_64
+          - build: CPython 3.14 64 bits manylinux_2_28
+            manylinux: manylinux_2_28
+            python: cp314-manylinux_x86_64
+            arch: x86_64
           # -------------------------------------------------------------------
           # CPython 64 bits manylinux2014
           # -------------------------------------------------------------------
@@ -128,10 +128,10 @@ jobs:
             manylinux: manylinux2014
             python: cp313-manylinux_x86_64
             arch: x86_64
-          # - build: CPython 3.14 64 bits manylinux2014
-          #   manylinux: manylinux2014
-          #   python: cp314-manylinux_x86_64
-          #   arch: x86_64
+          - build: CPython 3.14 64 bits manylinux2014
+            manylinux: manylinux2014
+            python: cp314-manylinux_x86_64
+            arch: x86_64
 
     steps:
       - uses: actions/checkout@v4
@@ -142,7 +142,7 @@ jobs:
           python-version: '3.11'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.1.4
+        uses: pypa/cibuildwheel@v3.3.0
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -190,10 +190,10 @@ jobs:
             manylinux: manylinux2014
             python: cp313-manylinux_aarch64
             arch: aarch64
-          # - build: CPython 3.14 ARM 64 bits manylinux2014
-          #   manylinux: manylinux2014
-          #   python: cp314-manylinux_aarch64
-          #   arch: aarch64
+          - build: CPython 3.14 ARM 64 bits manylinux2014
+            manylinux: manylinux2014
+            python: cp314-manylinux_aarch64
+            arch: aarch64
 
     steps:
       - uses: actions/checkout@v4
@@ -204,7 +204,7 @@ jobs:
           python-version: '3.11'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.1.4
+        uses: pypa/cibuildwheel@v3.3.0
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -221,7 +221,7 @@ jobs:
 
   macos:
     name: Build wheels on macOS
-    runs-on: macos-13
+    runs-on: macos-15-intel
     # Don't run on OCIO forks
     if: |
       github.event_name != 'schedule' ||
@@ -247,9 +247,9 @@ jobs:
           - build: CPython 3.13 64 bits
             python: cp313-macosx_x86_64
             arch: x86_64
-          # - build: CPython 3.14 64 bits
-          #   python: cp314-macosx_x86_64
-          #   arch: x86_64
+          - build: CPython 3.14 64 bits
+            python: cp314-macosx_x86_64
+            arch: x86_64
 
     steps:
       - uses: actions/checkout@v4
@@ -264,7 +264,7 @@ jobs:
           brew uninstall --ignore-dependencies openexr imath || true
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.1.4
+        uses: pypa/cibuildwheel@v3.3.0
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -306,9 +306,9 @@ jobs:
           - build: CPython 3.13 ARM 64 bits
             python: cp313-macosx_arm64
             arch: arm64
-          # - build: CPython 3.14 ARM 64 bits
-          #   python: cp314-macosx_arm64
-          #   arch: arm64
+          - build: CPython 3.14 ARM 64 bits
+            python: cp314-macosx_arm64
+            arch: arm64
 
     steps:
       - uses: actions/checkout@v4
@@ -319,7 +319,7 @@ jobs:
           python-version: '3.11'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.1.4
+        uses: pypa/cibuildwheel@v3.3.0
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -361,9 +361,9 @@ jobs:
           - build: CPython 3.13 64 bits
             python: cp313-win_amd64
             arch: AMD64
-          # - build: CPython 3.14 64 bits
-          #   python: cp314-win_amd64
-          #   arch: AMD64
+          - build: CPython 3.14 64 bits
+            python: cp314-win_amd64
+            arch: AMD64
 
     steps:
       - uses: actions/checkout@v4
@@ -374,7 +374,7 @@ jobs:
           python-version: '3.11'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.1.4
+        uses: pypa/cibuildwheel@v3.3.0
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}

diff --git a/share/cmake/modules/FindImath.cmake b/share/cmake/modules/FindImath.cmake
@@ -40,10 +40,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
     set(_Imath_REQUIRED_VARS Imath_LIBRARY)
     set(_Imath_LIB_VER "${Imath_FIND_VERSION_MAJOR}_${Imath_FIND_VERSION_MINOR}")
 
-    if(NOT DEFINED Imath_ROOT)
-        # Search for ImathConfig.cmake
-        find_package(Imath ${Imath_FIND_VERSION} CONFIG QUIET)
-    endif()
+    # Search for ImathConfig.cmake
+    find_package(Imath ${Imath_FIND_VERSION} CONFIG QUIET)
 
     if(Imath_FOUND)
         get_target_property(Imath_LIBRARY Imath::Imath LOCATION)

diff --git a/share/cmake/modules/FindOSL.cmake b/share/cmake/modules/FindOSL.cmake
@@ -29,22 +29,22 @@
 ###############################################################################
 ### Try to find package ###
 
-if(NOT DEFINED OSL_ROOT)
-    find_package(OSL ${OSL_FIND_VERSION} CONFIG QUIET)
-
-    set(OSL_SHADERS_INCLUDE_DIR ${OSL_INCLUDE_DIR}/../share)
-    # Variable used by the OSL unit tests. 
-    set(OSL_SHADERS_DIR ${OSL_SHADERS_INCLUDE_DIR}/OSL/shaders)
-
-    include (FindPackageHandleStandardArgs)
-    find_package_handle_standard_args (OSL
-        REQUIRED_VARS 
-            OSL_INCLUDE_DIR 
-            OSL_LIB_DIR 
-        VERSION_VAR   
-            OSL_VERSION
-    )
-else()
+find_package(OSL ${OSL_FIND_VERSION} CONFIG QUIET)
+
+set(OSL_SHADERS_INCLUDE_DIR ${OSL_INCLUDE_DIR}/../share)
+# Variable used by the OSL unit tests. 
+set(OSL_SHADERS_DIR ${OSL_SHADERS_INCLUDE_DIR}/OSL/shaders)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (OSL
+    REQUIRED_VARS 
+        OSL_INCLUDE_DIR 
+        OSL_LIB_DIR 
+    VERSION_VAR   
+        OSL_VERSION
+)
+
+if(NOT OSL_FOUND)
     set(OSL_INCLUDE_DIR ${OSL_ROOT}/include)
     set(OSL_VERSION_HEADER "${OSL_INCLUDE_DIR}/OSL/oslversion.h")
 

diff --git a/share/cmake/modules/Findexpat.cmake b/share/cmake/modules/Findexpat.cmake
@@ -39,10 +39,8 @@ endif()
 if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
     set(_expat_REQUIRED_VARS expat_LIBRARY)
 
-    if(NOT DEFINED expat_ROOT)
-        # Search for expat-config.cmake
-        find_package(expat ${expat_FIND_VERSION} CONFIG QUIET)
-    endif()
+    # Search for expat-config.cmake
+    find_package(expat ${expat_FIND_VERSION} CONFIG QUIET)
 
     if(expat_FOUND)
         if (TARGET expat::libexpat)

diff --git a/share/cmake/modules/Findminizip-ng.cmake b/share/cmake/modules/Findminizip-ng.cmake
@@ -45,10 +45,8 @@ if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
 endif()
 
 if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
-    if(NOT DEFINED minizip-ng_ROOT)
-        # Search for minizip-ng-config.cmake
-        find_package(minizip-ng ${minizip-ng_FIND_VERSION} CONFIG QUIET)
-    endif()
+    # Search for minizip-ng-config.cmake
+    find_package(minizip-ng ${minizip-ng_FIND_VERSION} CONFIG QUIET)
 
     if (minizip-ng_FOUND)
         get_target_property(minizip-ng_INCLUDE_DIR MINIZIP::minizip-ng INTERFACE_INCLUDE_DIRECTORIES)

diff --git a/share/cmake/modules/Findpybind11.cmake b/share/cmake/modules/Findpybind11.cmake
@@ -24,10 +24,8 @@
 ### Try to find package ###
 
 if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
-    if(NOT DEFINED pybind11_ROOT)
-        # Search for pybind11Config.cmake
-        find_package(pybind11 ${pybind11_FIND_VERSION} CONFIG QUIET)
-    endif()
+    # Search for pybind11Config.cmake
+    find_package(pybind11 ${pybind11_FIND_VERSION} CONFIG QUIET)
 
     if(NOT pybind11_FOUND)
         # Find include directory

diff --git a/share/cmake/modules/Findyaml-cpp.cmake b/share/cmake/modules/Findyaml-cpp.cmake
@@ -44,9 +44,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
     set(_yaml-cpp_REQUIRED_VARS yaml-cpp_LIBRARY)
 
     # Search for yaml-cpp-config.cmake
-    if(NOT DEFINED yaml-cpp_ROOT)
-        find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG ${quiet})
-    endif()
+    find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG ${quiet})
 
     if(yaml-cpp_FOUND)
         # Alias target for yaml-cpp < 0.8 compatibility