Skip to content

Commit 10a851a

Browse files
KelSolaarKelSolaar
authored
PR: Implement Support for Remaining DisplayP3 Colourspaces, and Other Next Release Features. (#100)
* Implement support for "Ruff". Signed-off-by: Thomas Mansencal <[email protected]> * Add "opencolorio_config_aces.utilities.ROOT_BUILD_DEFAULT" attribute. Signed-off-by: Thomas Mansencal <[email protected]> * Fix incorrect spreadsheet url in documentation. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for "sRGB Encoded P3-D65 - Texture" space. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for inverse "LMT" discovery. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for "DisplayP3" colourspace. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for missing "Canon" colourspaces. Signed-off-by: Thomas Mansencal <[email protected]> * Fix inexact reference to "D60" whitepoint. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for missing "Sony" colourspaces. Signed-off-by: Thomas Mansencal <[email protected]> * Update `matte_paint` and `texture_paint` roles. Signed-off-by: Thomas Mansencal <[email protected]> * Update various docstrings. Signed-off-by: Thomas Mansencal <[email protected]> * Update broken doctests. Signed-off-by: Thomas Mansencal <[email protected]> * Add "texture" categorie to "Raw" colourspace. Signed-off-by: Thomas Mansencal <[email protected]> * Update config mapping files. Signed-off-by: Thomas Mansencal <[email protected]> * Update various colourspace names and aliases. Signed-off-by: Thomas Mansencal <[email protected]> * Extract tag only from "aces-dev" version. Signed-off-by: Thomas Mansencal <[email protected]> * Update config mapping files. Signed-off-by: Thomas Mansencal <[email protected]> * Implement initial support for "AMF" components. Signed-off-by: Thomas Mansencal <[email protected]> * Update various "CLF" descriptions. Signed-off-by: Thomas Mansencal <[email protected]> * Update "requirements.txt" file. Signed-off-by: Thomas Mansencal <[email protected]> * Remove "Reference" role in "Reference" config. Signed-off-by: Thomas Mansencal <[email protected]> * Update supported "OpenColorIO" profile list. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for shorter config description. Signed-off-by: Thomas Mansencal <[email protected]> * Code formatting. Signed-off-by: Thomas Mansencal <[email protected]> * Update various docstrings. Signed-off-by: Thomas Mansencal <[email protected]> * Overhaul "pyproject.toml" file. Signed-off-by: Thomas Mansencal <[email protected]> * Improve dependency versions support. Signed-off-by: Thomas Mansencal <[email protected]> * Update "README.rst" file. Signed-off-by: Thomas Mansencal <[email protected]> --------- Signed-off-by: Thomas Mansencal <[email protected]>
1 parent 9a1ddea commit 10a851a

File tree

64 files changed

+14219
-1277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+14219
-1277
lines changed

‎.flake8

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/configuration-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install Package Dependencies
3737
run: |
3838
poetry run python -m pip install --upgrade pip
39-
poetry install --extras "graphviz optional"
39+
poetry install --with graphviz,optional
4040
shell: bash
4141
- name: ACES - Conversion Graph
4242
run: |

‎.github/workflows/continuous-integration-quality-unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Install Package Dependencies
3939
run: |
4040
poetry run python -m pip install --upgrade pip
41-
poetry install --extras "optional"
41+
poetry install --without graphviz
4242
shell: bash
4343
- name: Pre-Commit (All Files)
4444
run: |

‎.pre-commit-config.yaml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
repos:
2-
- repo: https://github.com/asottile/pyupgrade
3-
rev: v2.31.0
4-
hooks:
5-
- id: pyupgrade
6-
args: [--py39-plus]
72
- repo: https://github.com/ikamensh/flynt/
83
rev: '0.76'
94
hooks:
105
- id: flynt
6+
- repo: https://github.com/charliermarsh/ruff-pre-commit
7+
rev: 'v0.0.272'
8+
hooks:
9+
- id: ruff
1110
- repo: https://github.com/psf/black
1211
rev: 22.3.0
1312
hooks:
1413
- id: black
1514
language_version: python3.9
16-
- repo: https://github.com/PyCQA/flake8
17-
rev: 4.0.1
18-
hooks:
19-
- id: flake8
20-
- repo: https://github.com/pycqa/pydocstyle
21-
rev: 6.1.1
22-
hooks:
23-
- id: pydocstyle
24-
args:
25-
- --convention=numpy
26-
- --add-ignore=D104,D200,D202,D205,D301,D400

‎.readthedocs.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@ formats:
1616
- pdf
1717

1818
python:
19-
install:
20-
- method: pip
21-
path: .
22-
extra_requirements:
23-
- read-the-docs
19+
install:
20+
- requirements: docs/requirements.txt

‎README.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ as follows::
8484

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

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

93-
poetry install --extras "optional graphviz"
93+
poetry install --with graphviz,optional
9494

9595
Docker
9696
~~~~~~
@@ -122,7 +122,7 @@ dependencies in order to run and be able to generate the *OCIO* configurations:
122122
Primary Dependencies
123123
********************
124124

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

128128
Optional Dependencies
@@ -140,14 +140,11 @@ Development Dependencies
140140
- `black <https://pypi.org/project/black/>`__
141141
- `coverage <https://pypi.org/project/coverage/>`__
142142
- `coveralls <https://pypi.org/project/coveralls/>`__
143-
- `flake8 <https://pypi.org/project/flake8/>`__
144143
- `invoke <https://pypi.org/project/invoke/>`__
145144
- `mypy <https://pypi.org/project/mypy/>`__
146145
- `pre-commit <https://pypi.org/project/pre-commit/>`__
147146
- `pydata-sphinx-theme <https://pypi.org/project/pydata-sphinx-theme/>`__
148-
- `pydocstyle <https://pypi.org/project/pydocstyle/>`__
149147
- `pytest <https://pypi.org/project/pytest/>`__
150-
- `pyupgrade <https://pypi.org/project/pyupgrade/>`__
151148
- `restructuredtext-lint <https://pypi.org/project/restructuredtext-lint/>`__
152149
- `sphinx >= 4, < 5 <https://pypi.org/project/Sphinx/>`__
153150
- `twine <https://pypi.org/project/twine/>`__

‎docs/conf.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
master_doc = "index"
3737

3838
project = package.__application_name__
39-
copyright = package.__copyright__.replace("Copyright (C)", "")
39+
copyright = package.__copyright__.replace("Copyright (C)", "") # noqa: A001
4040
version = f"{package.__major_version__}.{package.__minor_version__}"
4141
release = package.__version__
4242

@@ -117,19 +117,3 @@
117117
epub_publisher = package.__author__
118118
epub_copyright = package.__copyright__.replace("Copyright (C)", "")
119119
epub_exclude_files = ["search.html"]
120-
121-
122-
def autodoc_process_docstring(app, what, name, obj, options, lines):
123-
"""Process the docstrings to remove the *# noqa* *flake8* pragma."""
124-
125-
for i, line in enumerate(lines):
126-
lines[i] = line.replace("# noqa", "")
127-
128-
129-
def setup(app):
130-
"""
131-
Prepare the extension and linking resources that Sphinx uses in the
132-
build process.
133-
"""
134-
135-
app.connect("autodoc-process-docstring", autodoc_process_docstring)

‎docs/installation.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ as follows::
3232

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

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

41-
poetry install --extras "optional graphviz"
41+
poetry install --with graphviz,optional
4242

4343
Docker
4444
------
@@ -70,7 +70,7 @@ dependencies in order to run and be able to generate the *OCIO* configurations:
7070
Primary Dependencies
7171
********************
7272

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

@@ -89,14 +89,11 @@ Development Dependencies
8989
- `black <https://pypi.org/project/black/>`__
9090
- `coverage <https://pypi.org/project/coverage/>`__
9191
- `coveralls <https://pypi.org/project/coveralls/>`__
92-
- `flake8 <https://pypi.org/project/flake8/>`__
9392
- `invoke <https://pypi.org/project/invoke/>`__
9493
- `mypy <https://pypi.org/project/mypy/>`__
9594
- `pre-commit <https://pypi.org/project/pre-commit/>`__
9695
- `pydata-sphinx-theme <https://pypi.org/project/pydata-sphinx-theme/>`__
97-
- `pydocstyle <https://pypi.org/project/pydocstyle/>`__
9896
- `pytest <https://pypi.org/project/pytest/>`__
99-
- `pyupgrade <https://pypi.org/project/pyupgrade/>`__
10097
- `restructuredtext-lint <https://pypi.org/project/restructuredtext-lint/>`__
10198
- `sphinx >= 4, < 5 <https://pypi.org/project/Sphinx/>`__
10299
- `twine <https://pypi.org/project/twine/>`__

‎docs/opencolorio_config_aces.config.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
Generation
66
==========
77

8-
Profile Version
9-
---------------
8+
Version Utilities
9+
-----------------
1010

1111
``opencolorio_config_aces``
1212

@@ -15,9 +15,10 @@ Profile Version
1515
.. autosummary::
1616
:toctree: generated/
1717

18-
ProfileVersion
1918
PROFILE_VERSION_DEFAULT
2019
SUPPORTED_PROFILE_VERSIONS
20+
DependencyVersions
21+
DEPENDENCY_VERSIONS
2122

2223
Config Generation Common Objects
2324
--------------------------------
@@ -70,6 +71,7 @@ Reference Configuration
7071
classify_aces_ctl_transforms
7172
discover_aces_ctl_transforms
7273
filter_ctl_transforms
74+
generate_amf_components
7375
print_aces_taxonomy
7476
unclassify_ctl_transforms
7577

@@ -100,7 +102,7 @@ Reference Configuration
100102
.. autosummary::
101103
:toctree: generated/
102104

103-
ColorspaceDescriptionStyle
105+
DescriptionStyle
104106
version_config_mapping_file
105107
generate_config_aces
106108

‎docs/opencolorio_config_aces.utilities.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,6 @@ Common
3636
regularise_version
3737
validate_method
3838
google_sheet_title
39-
slugify
39+
slugify
40+
attest
41+
timestamp

0 commit comments

Comments
 (0)