Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/configuration-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
strategy:
matrix:
os: [ubuntu-20.04]
python-version: [3.11]
os: [ubuntu-latest]
python-version: [3.13]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 2

build:
os: ubuntu-20.04
os: ubuntu-24.04
tools:
python: "3.9"
python: "3.13"
apt_packages:
- graphviz
- graphviz-dev
Expand Down
50 changes: 25 additions & 25 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -117,40 +117,40 @@ The **OpenColorIO Configuration for ACES** package requires various
dependencies in order to run and be able to generate the *OCIO* configurations:

Primary Dependencies
********************
~~~~~~~~~~~~~~~~~~~~

- `python >= 3.10, < 3.14 <https://www.python.org/download/releases>`__
- `opencolorio <https://pypi.org/project/opencolorio>`__
- `requests <https://pypi.org/project/requests>`__
- `semver <https://pypi.org/project/semver>`__
- `python >= 3.10, < 3.14 <https://www.python.org/download/releases>`__
- `opencolorio <https://pypi.org/project/opencolorio>`__
- `requests <https://pypi.org/project/requests>`__
- `semver <https://pypi.org/project/semver>`__

Optional Dependencies
*********************
~~~~~~~~~~~~~~~~~~~~~

- `colour-science <https://pypi.org/project/colour-science>`__
- `graphviz <https://www.graphviz.org>`__
- `jsonpickle <https://jsonpickle.github.io>`__
- `networkx <https://pypi.org/project/networkx>`__
- `pydot <https://pypi.org/project/pydot>`__
- `colour-science <https://pypi.org/project/colour-science>`__
- `graphviz <https://www.graphviz.org>`__
- `jsonpickle <https://jsonpickle.github.io>`__
- `networkx <https://pypi.org/project/networkx>`__
- `pydot <https://pypi.org/project/pydot>`__

Docs Dependencies
*****************
~~~~~~~~~~~~~~~~~

- `pydata-sphinx-theme <https://pypi.org/project/pydata-sphinx-theme>`__
- `sphinx <https://pypi.org/project/sphinx>`__
- `pydata-sphinx-theme <https://pypi.org/project/pydata-sphinx-theme>`__
- `sphinx <https://pypi.org/project/sphinx>`__

Development Dependencies
************************

- `coverage <https://pypi.org/project/coverage>`__
- `coveralls <https://pypi.org/project/coveralls>`__
- `hatch <https://pypi.org/project/hatch>`__
- `invoke <https://pypi.org/project/invoke>`__
- `pre-commit <https://pypi.org/project/pre-commit>`__
- `pyright <https://pypi.org/project/pyright>`__
- `pytest <https://pypi.org/project/pytest>`__
- `pytest-cov <https://pypi.org/project/pytest-cov>`__
- `pytest-xdist <https://pypi.org/project/pytest-xdist>`__
~~~~~~~~~~~~~~~~~~~~~~~~

- `coverage <https://pypi.org/project/coverage>`__
- `coveralls <https://pypi.org/project/coveralls>`__
- `hatch <https://pypi.org/project/hatch>`__
- `invoke <https://pypi.org/project/invoke>`__
- `pre-commit <https://pypi.org/project/pre-commit>`__
- `pyright <https://pypi.org/project/pyright>`__
- `pytest <https://pypi.org/project/pytest>`__
- `pytest-cov <https://pypi.org/project/pytest-cov>`__
- `pytest-xdist <https://pypi.org/project/pytest-xdist>`__

Components Status
^^^^^^^^^^^^^^^^^
Expand Down
11 changes: 8 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
================================================================
"""

import opencolorio_config_aces as package
import sys
from pathlib import Path

sys.path.append(str(Path(__file__).parent.parent))

import opencolorio_config_aces as package # noqa: E402

basename = package.__name__.replace("_", "-")

Expand All @@ -23,7 +28,7 @@
"sphinx.ext.mathjax",
]

intersphinx_mapping = {"python": ("https://docs.python.org/3.8", None)}
intersphinx_mapping = {"python": ("https://docs.python.org/3.13", None)}

autosummary_generate = True

Expand All @@ -36,7 +41,7 @@
master_doc = "index"

project = package.__application_name__
copyright = package.__copyright__.replace("Copyright (C)", "") # noqa: A001
copyright = package.__copyright__ # noqa: A001
version = f"{package.__major_version__}.{package.__minor_version__}"
release = package.__version__

Expand Down
54 changes: 27 additions & 27 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The *aces-dev* *CTL* reference graph can be plotted but it requires `Graphviz <h
to be installed on the system.

Docker
------
~~~~~~

Installing the dependencies for the `previous config generator <https://github.com/imageworks/OpenColorIO-Configs>`__
was not a trivial task. For ease of use an `aswf-docker <https://github.com/AcademySoftwareFoundation/aswf-docker>`__
Expand All @@ -59,43 +59,43 @@ Then, to run *bash* in the container::
docker run -it -v ${PWD}:/home/aswf/OpenColorIO-Config-ACES aswf/opencolorio-config-aces:latest /bin/bash

Pypi
----
~~~~

The **OpenColorIO Configuration for ACES** package requires various
dependencies in order to run and be able to generate the *OCIO* configurations:

Primary Dependencies
********************
~~~~~~~~~~~~~~~~~~~~

- `python >= 3.10, < 3.14 <https://www.python.org/download/releases>`__
- `opencolorio <https://pypi.org/project/opencolorio>`__
- `requests <https://pypi.org/project/requests>`__
- `semver <https://pypi.org/project/semver>`__
- `python >= 3.10, < 3.14 <https://www.python.org/download/releases>`__
- `opencolorio <https://pypi.org/project/opencolorio>`__
- `requests <https://pypi.org/project/requests>`__
- `semver <https://pypi.org/project/semver>`__

Optional Dependencies
*********************
~~~~~~~~~~~~~~~~~~~~~

- `colour-science <https://pypi.org/project/colour-science>`__
- `graphviz <https://www.graphviz.org>`__
- `jsonpickle <https://jsonpickle.github.io>`__
- `networkx <https://pypi.org/project/networkx>`__
- `pydot <https://pypi.org/project/pydot>`__
- `colour-science <https://pypi.org/project/colour-science>`__
- `graphviz <https://www.graphviz.org>`__
- `jsonpickle <https://jsonpickle.github.io>`__
- `networkx <https://pypi.org/project/networkx>`__
- `pydot <https://pypi.org/project/pydot>`__

Docs Dependencies
*****************
~~~~~~~~~~~~~~~~~

- `pydata-sphinx-theme <https://pypi.org/project/pydata-sphinx-theme>`__
- `sphinx <https://pypi.org/project/sphinx>`__
- `pydata-sphinx-theme <https://pypi.org/project/pydata-sphinx-theme>`__
- `sphinx <https://pypi.org/project/sphinx>`__

Development Dependencies
************************

- `coverage <https://pypi.org/project/coverage>`__
- `coveralls <https://pypi.org/project/coveralls>`__
- `hatch <https://pypi.org/project/hatch>`__
- `invoke <https://pypi.org/project/invoke>`__
- `pre-commit <https://pypi.org/project/pre-commit>`__
- `pyright <https://pypi.org/project/pyright>`__
- `pytest <https://pypi.org/project/pytest>`__
- `pytest-cov <https://pypi.org/project/pytest-cov>`__
- `pytest-xdist <https://pypi.org/project/pytest-xdist>`__
~~~~~~~~~~~~~~~~~~~~~~~~

- `coverage <https://pypi.org/project/coverage>`__
- `coveralls <https://pypi.org/project/coveralls>`__
- `hatch <https://pypi.org/project/hatch>`__
- `invoke <https://pypi.org/project/invoke>`__
- `pre-commit <https://pypi.org/project/pre-commit>`__
- `pyright <https://pypi.org/project/pyright>`__
- `pytest <https://pypi.org/project/pytest>`__
- `pytest-cov <https://pypi.org/project/pytest-cov>`__
- `pytest-xdist <https://pypi.org/project/pytest-xdist>`__
4 changes: 2 additions & 2 deletions docs/opencolorio_config_aces.clf.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ Common LUT Format Discovery
.. autosummary::
:toctree: generated/

classify_clf_transforms
discover_clf_transforms
classify_clf_transforms
unclassify_clf_transforms
filter_clf_transforms
print_clf_taxonomy
unclassify_clf_transforms

Common LUT Format Generation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
15 changes: 12 additions & 3 deletions docs/opencolorio_config_aces.config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Version Utilities
:toctree: generated/

PROFILE_VERSION_DEFAULT
SUPPORTED_PROFILE_VERSIONS
PROFILE_VERSIONS

Build Configuration Utilities
-----------------------------
Expand All @@ -28,9 +28,9 @@ Build Configuration Utilities
.. autosummary::
:toctree: generated/

BuildConfiguration
BUILD_CONFIGURATIONS
BUILD_VARIANT_FILTERERS
BuildConfiguration

Config Generation Common Objects
--------------------------------
Expand Down Expand Up @@ -115,7 +115,6 @@ Reference Configuration
:toctree: generated/

DescriptionStyle
version_config_mapping_file
generate_config_aces

*ACES* Computer Graphics (CG) Config Generator
Expand All @@ -141,3 +140,13 @@ Reference Configuration
:toctree: generated/

generate_config_studio

Generation Utilities
~~~~~~~~~~~~~~~~~~~~

``opencolorio_config_aces``

.. autosummary::
:toctree: generated/

BUILTIN_TRANSFORMS
1 change: 0 additions & 1 deletion docs/opencolorio_config_aces.utilities.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Common
git_describe
matrix_3x3_to_4x4
multi_replace
regularise_version
validate_method
google_sheet_title
slugify
Expand Down
36 changes: 18 additions & 18 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
# uv export --no-hashes --all-extras --no-dev
accessible-pygments==0.0.5
alabaster==1.0.0
babel==2.16.0
beautifulsoup4==4.12.3
certifi==2024.8.30
charset-normalizer==3.4.0
babel==2.17.0
beautifulsoup4==4.13.3
certifi==2025.1.31
charset-normalizer==3.4.1
colorama==0.4.6 ; sys_platform == 'win32'
colour-science==0.4.6
docutils==0.21.2
idna==3.10
imageio==2.36.0
imageio==2.37.0
imagesize==1.4.1
jinja2==3.1.4
jsonpickle==2.2.0
jinja2==3.1.6
jsonpickle==4.0.2
markupsafe==3.0.2
networkx==3.4.2
numpy==2.1.3
opencolorio==2.4.0
numpy==2.2.3
opencolorio==2.4.1
packaging==24.2
pillow==11.0.0
pydata-sphinx-theme==0.16.0
pydot==3.0.2
pygments==2.18.0
pyparsing==3.2.0
pillow==11.1.0
pydata-sphinx-theme==0.16.1
pydot==3.0.4
pygments==2.19.1
pyparsing==3.2.1
requests==2.32.3
scipy==1.14.1
semver==3.0.2
scipy==1.15.2
semver==3.0.4
snowballstemmer==2.2.0
soupsieve==2.6
sphinx==8.1.3
Expand All @@ -36,6 +36,6 @@ sphinxcontrib-htmlhelp==2.1.0
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==2.0.0
sphinxcontrib-serializinghtml==2.0.0
tomli==2.1.0 ; python_full_version < '3.11'
tomli==2.2.1 ; python_full_version < '3.11'
typing-extensions==4.12.2
urllib3==2.2.3
urllib3==2.3.0
13 changes: 10 additions & 3 deletions opencolorio_config_aces/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@
)
from .config import (
BUILTIN_TRANSFORMS,
BUILD_CONFIGURATIONS,
BUILD_VARIANT_FILTERERS,
ConfigData,
PROFILE_VERSION_DEFAULT,
PROFILE_VERSIONS,
BuildConfiguration,
deserialize_config_data,
generate_config,
serialize_config_data,
Expand All @@ -48,6 +51,7 @@
discover_aces_ctl_transforms,
filter_ctl_transforms,
filter_nodes,
generate_amf_components,
node_to_ctl_transform,
plot_aces_conversion_graph,
print_aces_taxonomy,
Expand Down Expand Up @@ -87,9 +91,12 @@
]
__all__ += [
"BUILTIN_TRANSFORMS",
"BUILD_CONFIGURATIONS",
"BUILD_VARIANT_FILTERERS",
"ConfigData",
"PROFILE_VERSION_DEFAULT",
"PROFILE_VERSIONS",
"BuildConfiguration",
"deserialize_config_data",
"generate_config",
"serialize_config_data",
Expand All @@ -103,6 +110,7 @@
"discover_aces_ctl_transforms",
"filter_ctl_transforms",
"filter_nodes",
"generate_amf_components",
"node_to_ctl_transform",
"plot_aces_conversion_graph",
"print_aces_taxonomy",
Expand All @@ -126,6 +134,5 @@
__application_name__ = "OpenColorIO Configuration for ACES"

__major_version__ = "2"
__minor_version__ = "0"
__change_version__ = "0"
__version__ = ".".join((__major_version__, __minor_version__, __change_version__))
__minor_version__ = "4"
__version__ = f"{__major_version__}.{__minor_version__}"
2 changes: 2 additions & 0 deletions opencolorio_config_aces/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from .generation import (
BUILTIN_TRANSFORMS,
BUILD_CONFIGURATIONS,
BUILD_VARIANT_FILTERERS,
ConfigData,
PROFILE_VERSION_DEFAULT,
PROFILE_VERSIONS,
Expand Down Expand Up @@ -58,6 +59,7 @@
__all__ += [
"BUILTIN_TRANSFORMS",
"BUILD_CONFIGURATIONS",
"BUILD_VARIANT_FILTERERS",
"ConfigData",
"PROFILE_VERSION_DEFAULT",
"PROFILE_VERSIONS",
Expand Down
Loading