Skip to content

Commit f01ec88

Browse files
authored
Merge pull request #11 from AcademySoftwareFoundation/feature/overhaul
PR: Overhaul "aces-dev" Reference Config Generator
2 parents 738ba97 + e29d118 commit f01ec88

File tree

18 files changed

+1620
-685
lines changed

18 files changed

+1620
-685
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ jobs:
3535
shell: bash
3636
- name: Install Package Dependencies
3737
run: |
38-
poetry install
38+
poetry install --extras "graph"
3939
shell: bash
4040
- name: Lint with flake8
4141
run: |
4242
poetry run flake8 $CI_PACKAGE --count --show-source --statistics --exclude=$CI_FLAKE8_EXCLUDED
4343
shell: bash
4444
- name: Test with nosetests
4545
run: |
46-
poetry run python -W ignore -m nose -q -v --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=$CI_PACKAGE $CI_PACKAGE
46+
poetry run python -W ignore -m nose -q -v --with-doctest --doctest-options=+ELLIPSIS --with-coverage --traverse-namespace --cover-package=$CI_PACKAGE $CI_PACKAGE
4747
shell: bash
4848
# - name: Upload Coverage to coveralls.io
4949
# run: |

docs/opencolorio_config_aces.config.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Config Generation Common Objects
1818
:toctree: generated/
1919

2020
colorspace_factory
21+
view_transform_factory
22+
look_factory
2123
ConfigData
2224
validate_config
2325
generate_config
@@ -69,5 +71,5 @@ Reference Configuration
6971
.. autosummary::
7072
:toctree: generated/
7173

72-
classify_aces_ctl_transforms
74+
ColorspaceDescriptionStyle
7375
generate_config_aces

docs/opencolorio_config_aces.utilities.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ Common
2929
required
3030
is_string
3131
is_iterable
32+
git_describe

opencolorio_config_aces/__init__.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@
2121

2222
from .config import (
2323
ConfigData, build_aces_conversion_graph, classify_aces_ctl_transforms,
24-
ctl_transform_to_colorspace, colorspace_factory, conversion_path,
25-
ctl_transform_to_node, discover_aces_ctl_transforms, filter_ctl_transforms,
26-
filter_nodes, generate_config, generate_config_aces,
27-
node_to_builtin_transform, node_to_colorspace, node_to_ctl_transform,
24+
colorspace_factory, conversion_path, ctl_transform_to_node,
25+
discover_aces_ctl_transforms, filter_ctl_transforms, filter_nodes,
26+
generate_config, generate_config_aces, node_to_ctl_transform,
2827
plot_aces_conversion_graph, print_aces_taxonomy, unclassify_ctl_transforms,
29-
validate_config)
28+
validate_config, view_transform_factory)
3029

3130
__author__ = 'OpenColorIO Contributors'
3231
__copyright__ = 'Copyright Contributors to the OpenColorIO Project.'
@@ -38,12 +37,11 @@
3837
__all__ = [
3938
'ConfigData', 'build_aces_conversion_graph',
4039
'classify_aces_ctl_transforms', 'colorspace_factory', 'conversion_path',
41-
'ctl_transform_to_colorspace', 'ctl_transform_to_node',
42-
'discover_aces_ctl_transforms', 'filter_ctl_transforms', 'filter_nodes',
43-
'generate_config', 'generate_config_aces', 'node_to_builtin_transform',
44-
'node_to_colorspace', 'node_to_ctl_transform',
40+
'ctl_transform_to_node', 'discover_aces_ctl_transforms',
41+
'filter_ctl_transforms', 'filter_nodes', 'generate_config',
42+
'generate_config_aces', 'node_to_ctl_transform',
4543
'plot_aces_conversion_graph', 'print_aces_taxonomy',
46-
'unclassify_ctl_transforms', 'validate_config'
44+
'unclassify_ctl_transforms', 'validate_config', 'view_transform_factory'
4745
]
4846

4947
__application_name__ = 'OpenColorIO Configuration for ACES'
Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright Contributors to the OpenColorIO Project.
33

4-
from .generation import (ConfigData, colorspace_factory, generate_config,
4+
from .generation import (ConfigData, colorspace_factory,
5+
view_transform_factory, look_factory, generate_config,
56
validate_config)
67
from .reference import (
7-
build_aces_conversion_graph, classify_aces_ctl_transforms, conversion_path,
8-
ctl_transform_to_colorspace, ctl_transform_to_node,
8+
ColorspaceDescriptionStyle, build_aces_conversion_graph,
9+
classify_aces_ctl_transforms, conversion_path, ctl_transform_to_node,
910
discover_aces_ctl_transforms, filter_ctl_transforms, filter_nodes,
10-
generate_config_aces, node_to_builtin_transform, node_to_colorspace,
11-
node_to_ctl_transform, plot_aces_conversion_graph, print_aces_taxonomy,
12-
unclassify_ctl_transforms)
11+
generate_config_aces, node_to_ctl_transform, plot_aces_conversion_graph,
12+
print_aces_taxonomy, unclassify_ctl_transforms)
1313

1414
__all__ = [
15-
'ConfigData', 'colorspace_factory', 'generate_config', 'validate_config'
15+
'ConfigData', 'colorspace_factory', 'view_transform_factory',
16+
'look_factory', 'generate_config', 'validate_config'
1617
]
1718
__all__ += [
18-
'build_aces_conversion_graph', 'classify_aces_ctl_transforms',
19-
'conversion_path', 'ctl_transform_to_colorspace', 'ctl_transform_to_node',
19+
'ColorspaceDescriptionStyle', 'build_aces_conversion_graph',
20+
'classify_aces_ctl_transforms', 'conversion_path', 'ctl_transform_to_node',
2021
'discover_aces_ctl_transforms', 'filter_ctl_transforms', 'filter_nodes',
21-
'generate_config_aces', 'node_to_builtin_transform', 'node_to_colorspace',
22-
'node_to_ctl_transform', 'plot_aces_conversion_graph',
23-
'print_aces_taxonomy', 'unclassify_ctl_transforms'
22+
'generate_config_aces', 'node_to_ctl_transform',
23+
'plot_aces_conversion_graph', 'print_aces_taxonomy',
24+
'unclassify_ctl_transforms'
2425
]
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright Contributors to the OpenColorIO Project.
33

4-
from .common import (colorspace_factory, ConfigData, validate_config,
5-
generate_config)
4+
from .common import (colorspace_factory, view_transform_factory, look_factory,
5+
ConfigData, validate_config, generate_config)
66

77
__all__ = [
8-
'colorspace_factory', 'ConfigData', 'validate_config', 'generate_config'
8+
'colorspace_factory', 'view_transform_factory', 'look_factory',
9+
'ConfigData', 'validate_config', 'generate_config'
910
]

0 commit comments

Comments
 (0)