Skip to content

Commit

Permalink
Merge branch 'main' into bug/ci_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
doug-walker authored Jul 11, 2024
2 parents 520c80c + dc13f29 commit e29ddc9
Show file tree
Hide file tree
Showing 48 changed files with 1,823 additions and 431 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ mastercopy
*.pyc
!*.yml
.vscode

src/apps/ocioview/poetry.lock
31 changes: 21 additions & 10 deletions COMMITTERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,32 @@

# OpenColorIO Committers

The current OpenColorIO Committers are:
### Current OpenColorIO Committers

| Name | GitHub ID |
| -------------- | -----------------
| Malcolm Humphreys | @malcolmhumphreys |
| Jeremy Selan | @jeremyselan |
| Steve Lavietes | @stevelavietes |
| Robert Molholm | @rmolholm |
| -------------- | ----------------- |
| Michael Dolan | @michdolan |
| Mark Boorer | @Shootfast |
| Matthias Scharfenberg | @Tristimulus |
| Sean Cooper | @scoopxyz
| Patrick Hodoul | @hodoulp
| Cottalango Leon | @loorthu
| Sean Cooper | @scoopxyz |
| Doug Walker | @doug-walker |
| Kevin Wheatley | @KevinJW |
| Rémi Achard | @remia |
| Carol Payne | @carolalynn |
| Thomas Mansencal | @KelSolaar |
| Mark Reid | @markreidvfx |
| Cuneyt Ozdas | @cozdas |

### Emeritus OpenColorIO Committers

| Name | GitHub ID |
| -------------- | ----------------- |
| Malcolm Humphreys | @malcolmhumphreys |
| Jeremy Selan | @jeremyselan |
| Steve Lavietes | @stevelavietes |
| Robert Molholm | @rmolholm |
| Matthias Scharfenberg | @Tristimulus |
| Patrick Hodoul | @hodoulp |
| Cottalango Leon | @loorthu |
| Cédrik Fuoco | @cedrik-fuoco-adsk |
| Larry Gritz | @lgritz |
| Michael Parsons | @mlfp |
35 changes: 21 additions & 14 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,14 @@ A subset of the Committers forms the Technical Steering Committee (TSC), which
has final authority over this project. As defined in the project charter, TSC
responsibilities include, but are not limited to:

* Coordinating technical direction of the Project
* Coordinating technical direction of the Project, including but not limited to:
* Participating in roadmapping and feature priority each year
* Participating in Working Groups as appropriate
* Actively tracking development & giving feedback promptly
* Participating in maintenance of technical documentation
* Actively discussing issues & reviewing pull requests
* Actively monitoring and assisting contributors on GitHub
* Actively monitoring and assisting folks on the OCIO slack instance
* Project governance and process (including this policy)
* Contribution policy
* GitHub repository hosting
Expand All @@ -81,7 +88,7 @@ communities
matters relating to the code base that affect multiple projects
* Coordinating any marketing, events, or communications regarding the project

Within the TSC are three elected leadership roles to be held by its members and
Within the TSC are two elected leadership roles to be held by its members and
voted on annually. Any TSC member can express interest in serving in a role, or
nominate another member to serve. There are no term limits, and one person may
hold multiple roles simultaneously. Should a TSC member resign from a leadership
Expand All @@ -96,10 +103,6 @@ providing oversight to project administration.
technical decisions, and is responsible for avoiding "design by committee"
pitfalls.

* ACES TAC Rep: This position maintains oversight of the critical relationship
between OCIO and ACES, representing OCIO on the ACES TAC and facilitating
coordination of shared initiatives between both project's leadership.

At the time of election, the TSC will also agree upon which of these two leaders
will serve as the OpenColorIO ASWF (Academy Software Foundation) TAC (Technical
Advisory Council) representative for the term. This member represents the
Expand All @@ -109,7 +112,6 @@ project at all ASWF TAC meetings.

* Chair: Carol Payne
* Chief Architect: Doug Walker
* ACES TAC Rep: Sean Cooper

### TSC Members

Expand All @@ -118,15 +120,20 @@ project at all ASWF TAC meetings.
* Mei Chu - Sony Pictures Imageworks
* Sean Cooper - ARRI
* Michael Dolan - Epic Games
* Patrick Hodoul - Autodesk
* Zach Lewis - Method Studios
* Thomas Mansencal - WetaFX
* Carol Payne - Netflix
* Carl Rand - Weta Digital
* Thomas Mansencal - Wētā FX
* Cuneyt Ozdas - Autodesk
* Carol Payne - Independent Consultant
* Mark Titchener - Foundry
* Mark Reid - Animal Logic
* Doug Walker - Autodesk
* Kevin Wheatley - Framestore

### TSC Emeritus

* Patrick Hodoul - Autodesk
* Carl Rand - Wētā FX

### TSC Meetings

Any meetings of the TSC are intended to be open to the public, except where
Expand All @@ -146,7 +153,7 @@ happen continuously on GitHub and be handled by the larger group of Committers.

Any community member or Contributor can ask that something be reviewed by the
TSC by logging a GitHub issue. Any Committer, TSC member, or the meeting chair
can bring the issue to the TSC's attention by applying the `tsc-review` label.
can bring the issue to the TSC's attention by applying the `Needs Discussion` label.

Prior to each TSC meeting, the meeting chair will share the agenda with members
of the TSC. TSC members can also add items to the agenda at the beginning of
Expand All @@ -155,11 +162,11 @@ each meeting. The meeting chair and the TSC cannot veto or remove items.
The TSC may invite additional persons to participate in a non-voting capacity.

The meeting chair is responsible for ensuring that minutes are taken and that
notes are submitted after the meeting to the public mailing list.
notes are submitted after the meeting to the public wiki.

Due to the challenges of scheduling a global meeting with participants in
several time zones, the TSC will seek to resolve as many agenda items as
possible outside of meetings on the public mailing list.
possible outside of meetings via discussion on Slack or other methods.

### TSC Nomination

Expand Down
2 changes: 1 addition & 1 deletion src/apps/ocioview/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from pathlib import Path

import PyOpenColorIO as ocio
from PySide6 import QtCore, QtGui, QtWidgets, QtOpenGL
from PySide6 import QtCore, QtGui, QtWidgets

import ocioview.log_handlers # Import to initialize logging
from ocioview.main_window import OCIOView
Expand Down
5 changes: 3 additions & 2 deletions src/apps/ocioview/ocioview/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
ROOT_DIR = Path(__file__).parent.parent

# Sizes
ICON_SIZE_ITEM = QtCore.QSize(20, 20)
ICON_SIZE_BUTTON = QtCore.QSize(24, 24)
ICON_SIZE_BUTTON = QtCore.QSize(18, 18)
ICON_SIZE_ITEM = QtCore.QSize(18, 18)
ICON_SIZE_TAB = QtCore.QSize(16, 16)
ICON_SCALE_FACTOR = 1.15

MARGIN_WIDTH = 13 # Pixels
Expand Down
2 changes: 2 additions & 0 deletions src/apps/ocioview/ocioview/inspect/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenColorIO Project.

from .chromaticities_inspector import ChromaticitiesInspector
from .code_inspector import CodeInspector
from .curve_inspector import CurveInspector
from .log_inspector import LogInspector
Loading

0 comments on commit e29ddc9

Please sign in to comment.