Merge branch 'AcademySoftwareFoundation:main' into ROMM

Author: ssh4net

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenColorIO Project.
+
+version: 2
+
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.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]

.github/workflows/release-sign.yml

@@ -0,0 +1,67 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenColorIO Project.
+
+#
+# Releases are signed via https://github.com/sigstore/sigstore-python.
+# See https://docs.sigstore.dev for information about sigstore.
+#
+# This action creates a .tar.gz of the complete OpenColorIO source tree at
+# the given release tag, signs it via sigstore, and uploads the
+# .tar.gz and the associated .tar.gz.sigstore credential bundle.
+#
+# To verify a downloaded release at a given tag:
+#
+#   % pip install sigstore
+#   % sigstore verify github --cert-identity https://github.com/AcademySoftwareFoundation/OpenColorIO/.github/workflows/release-sign.yml@refs/tags/<tag> OpenColorIO-<tag>.tar.gz
+#
+
+name: Sign Release
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  release:
+    name: Sign & upload release artifacts
+    runs-on: ubuntu-latest
+
+    env:
+      TAG: ${{ github.ref_name }}
+    permissions:
+      contents: write
+      id-token: write
+      repository-projects: write
+
+    steps:
+
+      - name: Set Prefix
+        # The tag name begins with a 'v', e.g. "v2.4.0", but the prefix
+        # should omit the 'v', so the tarball "OpenColorIO-2.4.0.tar.gz"
+        # extracts files into "OpenColorIO-2.4.0/...". This matches
+        # the GitHub release page autogenerated artifact conventions.
+        run: |
+          echo OCIO_PREFIX=OpenColorIO-${TAG//v}/ >> $GITHUB_ENV
+          echo OCIO_TARBALL=OpenColorIO-${TAG//v}.tar.gz >> $GITHUB_ENV
+        shell: bash
+
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Create archive
+        run: git archive --format=tar.gz -o ${OCIO_TARBALL} --prefix ${OCIO_PREFIX} ${TAG}
+
+      - name: Sign archive with Sigstore
+        uses: sigstore/gh-action-sigstore-python@a5caf349bc536fbef3668a10ed7f5cd309a4b53d # v3.2.0
+        with:
+          inputs: ${{ env.OCIO_TARBALL }}
+          upload-signing-artifacts: false
+          release-signing-artifacts: false
+
+      - name: Upload release archive
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh release upload ${TAG} ${OCIO_TARBALL} ${OCIO_TARBALL}.sigstore.json

.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 }}

.gitignore

@@ -10,6 +10,8 @@ dist*
 mastercopy
 *.pyc
 !*.yml
-.vscode
+.idea/
+.venv/
+.vscode/
 
-src/apps/ocioview/poetry.lock
+src/apps/ocioview/uv.lock

CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 # Project definition.
 
 project(OpenColorIO 
-    VERSION 2.5.0
+    VERSION 2.6.0
     DESCRIPTION "OpenColorIO (OCIO) is a complete color management solution"
     HOMEPAGE_URL https://github.com/AcademySoftwareFoundation/OpenColorIO
     LANGUAGES CXX C)

docs/index.rst

@@ -36,19 +36,52 @@ best leverage them.  We have an OCIO User Experience (UX) working group that is
 gradually working on more coverage.
 
 The documentation is a work-in-progress and we would love to have your help to 
-improve it!  An easy way to get involved is to join the #docs or #ux channel on 
+improve it!  An easy way to get involved is to join the #opencolorio channel on 
 :ref:`slack`.
 
 
+Roadmap
+=======
+
+The project attempts to maintain a roadmap to give the community insight into
+upcoming development. The items are grouped into "Now", "Next", and "Later" categories.
+"Now" indicates work that is currently in-progress. "Next" indicates work that is being
+planned for imminent development (meaning now would be a good time to provide your input).
+The roadmap is available `here. <https://roadmap.opencolorio.org>`_
+
+
 Community
 =========
 
+.. _meetings:
+
+Meetings
+********
+
+The OpenColorIO project has a Technical Steering Committee meeting on Zoom every two weeks
+at noon LA time. The Zoom link is available from the `OCIO Calendar. <https://calendar.opencolorio.org>`_
+
+There is a general working group and "office hours" meeting once a month in the same
+time slot. The Zoom link is available from the `OCIO Calendar. <https://calendar.opencolorio.org>`_
+
+These meetings are open to anyone!
+
+
+.. _slack:
+
+Slack
+*****
+
+Join us on the `ASWF Slack <https://academysoftwarefdn.slack.com/>`_ in the channels 
+`#opencolorio` and `#opencolor-configs`.
+
+
 .. _mailing_lists:
 
 Mailing Lists
 *************
 
-There are two mailing lists associated with OpenColorIO:
+Most of the conversation happens on Slack, but there are two mailing lists associated with OpenColorIO:
 
 `ocio-user <https://lists.aswf.io/g/ocio-user>`__\ ``@lists.aswf.io``
     For end users (artists, often) interested in OCIO profile design,
@@ -57,14 +90,40 @@ There are two mailing lists associated with OpenColorIO:
 `ocio-dev <https://lists.aswf.io/g/ocio-dev>`__\ ``@lists.aswf.io``
     For developers interested OCIO APIs, code integration, compilation, etc.
 
-.. _slack:
 
-Slack
-*****
+Related Projects
+================
+
+.. _cif:
+
+ASWF Color Interop Forum
+************************
+
+The CIF is an open, cross-project forum for discussing color interoperability across varying workflows 
+and standards. The aim isn’t necessarily to develop new standards, but rather to make recommendations 
+for how to improve color accuracy through the existing infrastructure. 
+
+Recommendations are published on the `ColorInterop GitHub. <https://github.com/AcademySoftwareFoundation/ColorInterop>`_
+
+The forum has a monthly Zoom meeting on Mondays at noon LA time, as posted on the 
+`OCIO Calendar. <https://calendar.opencolorio.org>`_
+
+Discussion happens in the `#color-interop-forum` channel on the ASWF Slack.
+
+
+.. _nano:
+
+NanoColor
+*********
+
+NanoColor is a collaboration between OpenUSD, MaterialX, and OpenColorIO to ensure that there 
+is interoperable and flexible color management among those projects and related projects in 
+the computer graphics world.
 
-There is an OpenColorIO Slack workspace at: `<https://opencolorio.slack.com>`_.  
+The working group has a Zoom meeting every two weeks on Mondays at 1:00 pm LA time, as posted on the 
+`OCIO Calendar. <https://calendar.opencolorio.org>`_
 
-New users may join the workspace from `here <http://slack.opencolorio.org/>`_.
+Discussion happens in the `#nanocolor` channel on the ASWF Slack.
 
 
 Search

docs/releases/ocio_2_5.rst

@@ -39,6 +39,15 @@ For Developers
 
 * Please see the section below about version updates to required third-party dependencies.
 
+Library Version
++++++++++++++++
+
+* The 2.5.1 release is not ABI compatible with 2.5.0 for clients that use the GPU renderer
+  API due to a change made to correct an issue with the Vulkan support introduced in 2.5.0.
+  Because the SOVERSION of both libraries remains "2.5", applications using the GPU API that
+  were compiled with the 2.5.0 release must be recompiled to use the 2.5.1 library. Any
+  further releases in the 2.5.x series will be ABI-compatible with 2.5.1.
+
 
 New Feature Guide
 =================

docs/site/homepage/config.toml

@@ -143,7 +143,7 @@ languageCode = "en-us"
 contentDir = "content/english"
 weight = 1
 home = "Home"
-copyright = "copyright © 2020 OpenColorIO Contributors"
+copyright = "Copyright © OpenColorIO a Series of LF Projects, LLC. For web site terms of use, trademark policy and other project policies please see https://lfprojects.org/."
 
 ################################ France Language ########################
 [Languages.fr]
@@ -152,4 +152,4 @@ languageCode = "fr-fr"
 contentDir = "content/french"
 weight = 2
 home = "Accueil"
-copyright = "copyright © 2020 [gethugothemes](https://gethugothemes.com) tous droits réservés"
+copyright = "Copyright © OpenColorIO, a Series of LF Projects, LLC. Pour les conditions d'utilisation du site Web, la politique sur les marques et autres politiques de projet, voir https://lfprojects.org/."

docs/site/homepage/data/en/contact.yml

@@ -9,8 +9,8 @@ contact:
   contact_list:
     - icon : ti-comment # themify icon pack : https://themify.me/themify-icons
       name: "Slack:"
-      info : "OpenColorIO"
-      link: "http://slack.opencolorio.org"
+      info : "#OpenColorIO"
+      link: "https://academysoftwarefdn.slack.com"
 
     - icon : ti-email # themify icon pack : https://themify.me/themify-icons
       name: "OCIO-User:"