Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Implement Support for Remaining DisplayP3 Colourspaces, and Other Next Release Features. #100

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
bbea48c
Implement support for "Ruff".
KelSolaar Jun 18, 2023
8b0bbc9
Add "opencolorio_config_aces.utilities.ROOT_BUILD_DEFAULT" attribute.
KelSolaar Jun 18, 2023
87a1556
Fix incorrect spreadsheet url in documentation.
KelSolaar Jun 23, 2023
66b23e2
Implement support for "sRGB Encoded P3-D65 - Texture" space.
KelSolaar Jun 23, 2023
e648216
Implement support for inverse "LMT" discovery.
KelSolaar Jul 5, 2023
69c40aa
Implement support for "DisplayP3" colourspace.
KelSolaar Jul 28, 2023
bf8bed9
Implement support for missing "Canon" colourspaces.
KelSolaar Jul 28, 2023
a84d6fa
Fix inexact reference to "D60" whitepoint.
KelSolaar Jul 28, 2023
c65cbc2
Implement support for missing "Sony" colourspaces.
KelSolaar Jul 30, 2023
e465c90
Update `matte_paint` and `texture_paint` roles.
KelSolaar Jul 30, 2023
cfe8066
Update various docstrings.
KelSolaar Jul 26, 2023
181df7c
Update broken doctests.
KelSolaar Jul 28, 2023
1c9b530
Add "texture" categorie to "Raw" colourspace.
KelSolaar Jul 31, 2023
c2020e6
Update config mapping files.
KelSolaar Jul 31, 2023
7c32d15
Update various colourspace names and aliases.
KelSolaar Jul 31, 2023
55274e5
Extract tag only from "aces-dev" version.
KelSolaar Aug 5, 2023
f9e9003
Update config mapping files.
KelSolaar Aug 19, 2023
ccf11e8
Implement initial support for "AMF" components.
KelSolaar Aug 12, 2023
d824a2e
Update various "CLF" descriptions.
KelSolaar Aug 22, 2023
e78a168
Update "requirements.txt" file.
KelSolaar Sep 1, 2023
73b2581
Remove "Reference" role in "Reference" config.
KelSolaar Sep 1, 2023
75bff19
Update supported "OpenColorIO" profile list.
KelSolaar Sep 1, 2023
e4fcd0c
Implement support for shorter config description.
KelSolaar Sep 1, 2023
db2064c
Code formatting.
KelSolaar Sep 1, 2023
1025589
Update various docstrings.
KelSolaar Sep 1, 2023
5dcd517
Overhaul "pyproject.toml" file.
KelSolaar Sep 2, 2023
e0a7c15
Improve dependency versions support.
KelSolaar Sep 2, 2023
39e5e48
Update "README.rst" file.
KelSolaar Sep 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions .flake8

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/configuration-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Install Package Dependencies
run: |
poetry run python -m pip install --upgrade pip
poetry install --extras "graphviz optional"
poetry install --with graphviz,optional
shell: bash
- name: ACES - Conversion Graph
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Install Package Dependencies
run: |
poetry run python -m pip install --upgrade pip
poetry install --extras "optional"
poetry install --without graphviz
shell: bash
- name: Pre-Commit (All Files)
run: |
Expand Down
20 changes: 4 additions & 16 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
hooks:
- id: pyupgrade
args: [--py39-plus]
- repo: https://github.com/ikamensh/flynt/
rev: '0.76'
hooks:
- id: flynt
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: 'v0.0.272'
hooks:
- id: ruff
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
language_version: python3.9
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
hooks:
- id: flake8
- repo: https://github.com/pycqa/pydocstyle
rev: 6.1.1
hooks:
- id: pydocstyle
args:
- --convention=numpy
- --add-ignore=D104,D200,D202,D205,D301,D400
7 changes: 2 additions & 5 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@ formats:
- pdf

python:
install:
- method: pip
path: .
extra_requirements:
- read-the-docs
install:
- requirements: docs/requirements.txt
9 changes: 3 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ as follows::

git clone --recursive https://github.com/AcademySoftwareFoundation/OpenColorIO-Config-ACES.git
cd OpenColorIO-Config-ACES
poetry install --extras "optional"
poetry install --with optional

The *aces-dev* *CTL* reference graph can be plotted but it requires `Graphviz <https://graphviz.org/>`__
to be installed on the system and having installed the optional `pygraphviz <https://pypi.org/project/pygraphviz/>`__:
python package::

poetry install --extras "optional graphviz"
poetry install --with graphviz,optional

Docker
~~~~~~
Expand Down Expand Up @@ -122,7 +122,7 @@ dependencies in order to run and be able to generate the *OCIO* configurations:
Primary Dependencies
********************

- `python >= 3.8, < 3.11 <https://www.python.org/download/releases/>`__
- `python >= 3.9, < 3.11 <https://www.python.org/download/releases/>`__
- `OpenColorIO <https://opencolorio.org/>`__

Optional Dependencies
Expand All @@ -140,14 +140,11 @@ Development Dependencies
- `black <https://pypi.org/project/black/>`__
- `coverage <https://pypi.org/project/coverage/>`__
- `coveralls <https://pypi.org/project/coveralls/>`__
- `flake8 <https://pypi.org/project/flake8/>`__
- `invoke <https://pypi.org/project/invoke/>`__
- `mypy <https://pypi.org/project/mypy/>`__
- `pre-commit <https://pypi.org/project/pre-commit/>`__
- `pydata-sphinx-theme <https://pypi.org/project/pydata-sphinx-theme/>`__
- `pydocstyle <https://pypi.org/project/pydocstyle/>`__
- `pytest <https://pypi.org/project/pytest/>`__
- `pyupgrade <https://pypi.org/project/pyupgrade/>`__
- `restructuredtext-lint <https://pypi.org/project/restructuredtext-lint/>`__
- `sphinx >= 4, < 5 <https://pypi.org/project/Sphinx/>`__
- `twine <https://pypi.org/project/twine/>`__
Expand Down
18 changes: 1 addition & 17 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
master_doc = "index"

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

Expand Down Expand Up @@ -117,19 +117,3 @@
epub_publisher = package.__author__
epub_copyright = package.__copyright__.replace("Copyright (C)", "")
epub_exclude_files = ["search.html"]


def autodoc_process_docstring(app, what, name, obj, options, lines):
"""Process the docstrings to remove the *# noqa* *flake8* pragma."""

for i, line in enumerate(lines):
lines[i] = line.replace("# noqa", "")


def setup(app):
"""
Prepare the extension and linking resources that Sphinx uses in the
build process.
"""

app.connect("autodoc-process-docstring", autodoc_process_docstring)
9 changes: 3 additions & 6 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ as follows::

git clone --recursive https://github.com/AcademySoftwareFoundation/OpenColorIO-Config-ACES.git
cd OpenColorIO-Config-ACES
poetry install --extras "optional"
poetry install --with optional

The *aces-dev* *CTL* reference graph can be plotted but it requires `Graphviz <https://graphviz.org/>`__
to be installed on the system and having installed the optional `pygraphviz <https://pypi.org/project/pygraphviz/>`__:
python package::

poetry install --extras "optional graphviz"
poetry install --with graphviz,optional

Docker
------
Expand Down Expand Up @@ -70,7 +70,7 @@ dependencies in order to run and be able to generate the *OCIO* configurations:
Primary Dependencies
********************

- `python >= 3.8, < 3.11 <https://www.python.org/download/releases/>`__
- `python >= 3.9, < 3.11 <https://www.python.org/download/releases/>`__
- `black <https://pypi.org/project/black/>`__
- `OpenColorIO <https://opencolorio.org/>`__

Expand All @@ -89,14 +89,11 @@ Development Dependencies
- `black <https://pypi.org/project/black/>`__
- `coverage <https://pypi.org/project/coverage/>`__
- `coveralls <https://pypi.org/project/coveralls/>`__
- `flake8 <https://pypi.org/project/flake8/>`__
- `invoke <https://pypi.org/project/invoke/>`__
- `mypy <https://pypi.org/project/mypy/>`__
- `pre-commit <https://pypi.org/project/pre-commit/>`__
- `pydata-sphinx-theme <https://pypi.org/project/pydata-sphinx-theme/>`__
- `pydocstyle <https://pypi.org/project/pydocstyle/>`__
- `pytest <https://pypi.org/project/pytest/>`__
- `pyupgrade <https://pypi.org/project/pyupgrade/>`__
- `restructuredtext-lint <https://pypi.org/project/restructuredtext-lint/>`__
- `sphinx >= 4, < 5 <https://pypi.org/project/Sphinx/>`__
- `twine <https://pypi.org/project/twine/>`__
Expand Down
10 changes: 6 additions & 4 deletions docs/opencolorio_config_aces.config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Generation
==========

Profile Version
---------------
Version Utilities
-----------------

``opencolorio_config_aces``

Expand All @@ -15,9 +15,10 @@ Profile Version
.. autosummary::
:toctree: generated/

ProfileVersion
PROFILE_VERSION_DEFAULT
SUPPORTED_PROFILE_VERSIONS
DependencyVersions
DEPENDENCY_VERSIONS

Config Generation Common Objects
--------------------------------
Expand Down Expand Up @@ -70,6 +71,7 @@ Reference Configuration
classify_aces_ctl_transforms
discover_aces_ctl_transforms
filter_ctl_transforms
generate_amf_components
print_aces_taxonomy
unclassify_ctl_transforms

Expand Down Expand Up @@ -100,7 +102,7 @@ Reference Configuration
.. autosummary::
:toctree: generated/

ColorspaceDescriptionStyle
DescriptionStyle
version_config_mapping_file
generate_config_aces

Expand Down
4 changes: 3 additions & 1 deletion docs/opencolorio_config_aces.utilities.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ Common
regularise_version
validate_method
google_sheet_title
slugify
slugify
attest
timestamp
2 changes: 1 addition & 1 deletion docs/process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The repository contains code to generate, discover and classify the additional *
CG Config Generation
^^^^^^^^^^^^^^^^^^^^

The *CG* config generator also uses a *CSV* file generated from a `spreadsheet <https://docs.google.com/spreadsheets/d/1nE95DEVtxtEkcIEaJk0WekyEH0Rcs8z_3fdwUtqP8V>`__ that expresses which ``ACEStransformID`` should be used from the `Reference` config and which ``CLFtransformID`` should be used from the shipped *CLF* transforms.
The *CG* config generator also uses a *CSV* file generated from a `spreadsheet <https://docs.google.com/spreadsheets/d/1nE95DEVtxtEkcIEaJk0WekyEH0Rcs8z_3fdwUtqP8V4>`__ that expresses which ``ACEStransformID`` should be used from the `Reference` config and which ``CLFtransformID`` should be used from the shipped *CLF* transforms.

- :func:`opencolorio_config_aces.generate_config_cg`

Expand Down
11 changes: 4 additions & 7 deletions opencolorio_config_aces/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
BUILTIN_TRANSFORMS,
ConfigData,
PROFILE_VERSION_DEFAULT,
ProfileVersion,
SUPPORTED_PROFILE_VERSIONS,
PROFILE_VERSIONS,
deserialize_config_data,
generate_config,
serialize_config_data,
Expand All @@ -54,10 +53,9 @@
print_aces_taxonomy,
unclassify_ctl_transforms,
version_aces_dev,
version_config_mapping_file,
)
from .config import (
ColorspaceDescriptionStyle,
DescriptionStyle,
generate_config_aces,
)
from .config import generate_config_cg, generate_config_studio
Expand Down Expand Up @@ -91,8 +89,7 @@
"BUILTIN_TRANSFORMS",
"ConfigData",
"PROFILE_VERSION_DEFAULT",
"ProfileVersion",
"SUPPORTED_PROFILE_VERSIONS",
"PROFILE_VERSIONS",
"deserialize_config_data",
"generate_config",
"serialize_config_data",
Expand All @@ -114,7 +111,7 @@
"version_config_mapping_file",
]
__all__ += [
"ColorspaceDescriptionStyle",
"DescriptionStyle",
"generate_config_aces",
]
__all__ += ["generate_config_cg", "generate_config_studio"]
Expand Down