From 9404c06b163b18672794ced12638b6063fc2b8dd Mon Sep 17 00:00:00 2001 From: Thomas Mansencal Date: Tue, 26 May 2015 10:56:17 +0200 Subject: [PATCH] Update package directory structure. --- aces_1.0.0/python/aces_ocio/__init__.py | 2 +- .../{create_aces_config.py => aces_config.py} | 21 ++++++++++---------- .../python/aces_ocio/colorspaces/__init__.py | 20 +++++++++++++++++++ .../aces.py} | 0 .../arri.py} | 0 .../canon.py} | 0 .../general.py} | 2 +- .../gopro.py} | 0 .../panasonic.py} | 0 .../red.py} | 0 .../sony.py} | 0 .../python/aces_ocio/tests/tests_aces_config.py | 2 +- aces_1.0.0/python/aces_ocio/utilities.py | 11 +++++----- aces_1.0.0/python/bin/create_aces_config | 2 +- 14 files changed, 39 insertions(+), 21 deletions(-) rename aces_1.0.0/python/aces_ocio/{create_aces_config.py => aces_config.py} (98%) create mode 100644 aces_1.0.0/python/aces_ocio/colorspaces/__init__.py rename aces_1.0.0/python/aces_ocio/{create_aces_colorspaces.py => colorspaces/aces.py} (100%) rename aces_1.0.0/python/aces_ocio/{create_arri_colorspaces.py => colorspaces/arri.py} (100%) rename aces_1.0.0/python/aces_ocio/{create_canon_colorspaces.py => colorspaces/canon.py} (100%) rename aces_1.0.0/python/aces_ocio/{create_general_colorspaces.py => colorspaces/general.py} (99%) rename aces_1.0.0/python/aces_ocio/{create_gopro_colorspaces.py => colorspaces/gopro.py} (100%) rename aces_1.0.0/python/aces_ocio/{create_panasonic_colorspaces.py => colorspaces/panasonic.py} (100%) rename aces_1.0.0/python/aces_ocio/{create_red_colorspaces.py => colorspaces/red.py} (100%) rename aces_1.0.0/python/aces_ocio/{create_sony_colorspaces.py => colorspaces/sony.py} (100%) diff --git a/aces_1.0.0/python/aces_ocio/__init__.py b/aces_1.0.0/python/aces_ocio/__init__.py index 3d33635..fe1f182 100644 --- a/aces_1.0.0/python/aces_ocio/__init__.py +++ b/aces_1.0.0/python/aces_ocio/__init__.py @@ -11,7 +11,7 @@ Usage Python ****** ->>> from aces_ocio.create_aces_config import create_ACES_config +>>> from aces_ocio.aces_config import create_ACES_config >>> aces_ctl_directory = '/path/to/github/checkout/releases/v1.0.0/transforms/ctl' >>> config_directory = '/path/to/configuration/dir' >>> create_ACES_config(aces_ctl_directory, config_directory, 1024, 33, True) diff --git a/aces_1.0.0/python/aces_ocio/create_aces_config.py b/aces_1.0.0/python/aces_ocio/aces_config.py similarity index 98% rename from aces_1.0.0/python/aces_ocio/create_aces_config.py rename to aces_1.0.0/python/aces_ocio/aces_config.py index 1c11f5e..a63acf7 100755 --- a/aces_1.0.0/python/aces_ocio/create_aces_config.py +++ b/aces_1.0.0/python/aces_ocio/aces_config.py @@ -11,18 +11,17 @@ import os import sys import PyOpenColorIO as ocio - -import aces_ocio.create_aces_colorspaces as aces -import aces_ocio.create_arri_colorspaces as arri -import aces_ocio.create_canon_colorspaces as canon -import aces_ocio.create_gopro_colorspaces as gopro -import aces_ocio.create_panasonic_colorspaces as panasonic -import aces_ocio.create_red_colorspaces as red -import aces_ocio.create_sony_colorspaces as sony -import aces_ocio.create_general_colorspaces as general - +from aces_ocio.colorspaces import aces +from aces_ocio.colorspaces import arri +from aces_ocio.colorspaces import canon +from aces_ocio.colorspaces import general +from aces_ocio.colorspaces import gopro +from aces_ocio.colorspaces import panasonic +from aces_ocio.colorspaces import red +from aces_ocio.colorspaces import sony from aces_ocio.process import Process + __author__ = 'ACES Developers' __copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers' __license__ = '' @@ -407,7 +406,7 @@ def create_config(config_data, nuke=False): # Works with Nuke Studio and Mari, but not Nuke # display_name = 'Utility' - #displays.append(display_name) + # displays.append(display_name) linear_display_space_name = config_data['linearDisplaySpace'].name log_display_space_name = config_data['logDisplaySpace'].name diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/__init__.py b/aces_1.0.0/python/aces_ocio/colorspaces/__init__.py new file mode 100644 index 0000000..b76e24e --- /dev/null +++ b/aces_1.0.0/python/aces_ocio/colorspaces/__init__.py @@ -0,0 +1,20 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import aces +import arri +import canon +import general +import gopro +import panasonic +import red +import sony + +__all__ = ['aces', + 'arri', + 'canon', + 'general', + 'gopro', + 'panasonic', + 'red', + 'sony'] diff --git a/aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py similarity index 100% rename from aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py rename to aces_1.0.0/python/aces_ocio/colorspaces/aces.py diff --git a/aces_1.0.0/python/aces_ocio/create_arri_colorspaces.py b/aces_1.0.0/python/aces_ocio/colorspaces/arri.py similarity index 100% rename from aces_1.0.0/python/aces_ocio/create_arri_colorspaces.py rename to aces_1.0.0/python/aces_ocio/colorspaces/arri.py diff --git a/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py b/aces_1.0.0/python/aces_ocio/colorspaces/canon.py similarity index 100% rename from aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py rename to aces_1.0.0/python/aces_ocio/colorspaces/canon.py diff --git a/aces_1.0.0/python/aces_ocio/create_general_colorspaces.py b/aces_1.0.0/python/aces_ocio/colorspaces/general.py similarity index 99% rename from aces_1.0.0/python/aces_ocio/create_general_colorspaces.py rename to aces_1.0.0/python/aces_ocio/colorspaces/general.py index 01d2c2d..db47cd7 100644 --- a/aces_1.0.0/python/aces_ocio/create_general_colorspaces.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/general.py @@ -9,7 +9,7 @@ from __future__ import division import PyOpenColorIO as ocio -import aces_ocio.create_aces_colorspaces as aces +from aces_ocio.colorspaces import aces from aces_ocio.utilities import ColorSpace, mat44_from_mat33 diff --git a/aces_1.0.0/python/aces_ocio/create_gopro_colorspaces.py b/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py similarity index 100% rename from aces_1.0.0/python/aces_ocio/create_gopro_colorspaces.py rename to aces_1.0.0/python/aces_ocio/colorspaces/gopro.py diff --git a/aces_1.0.0/python/aces_ocio/create_panasonic_colorspaces.py b/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py similarity index 100% rename from aces_1.0.0/python/aces_ocio/create_panasonic_colorspaces.py rename to aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py diff --git a/aces_1.0.0/python/aces_ocio/create_red_colorspaces.py b/aces_1.0.0/python/aces_ocio/colorspaces/red.py similarity index 100% rename from aces_1.0.0/python/aces_ocio/create_red_colorspaces.py rename to aces_1.0.0/python/aces_ocio/colorspaces/red.py diff --git a/aces_1.0.0/python/aces_ocio/create_sony_colorspaces.py b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py similarity index 100% rename from aces_1.0.0/python/aces_ocio/create_sony_colorspaces.py rename to aces_1.0.0/python/aces_ocio/colorspaces/sony.py diff --git a/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py b/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py index f41349e..40210f5 100644 --- a/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py +++ b/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py @@ -15,7 +15,7 @@ import tempfile import unittest from aces_ocio.utilities import files_walker -from aces_ocio.create_aces_config import ( +from aces_ocio.aces_config import ( ACES_OCIO_CTL_DIRECTORY_ENVIRON, create_ACES_config) diff --git a/aces_1.0.0/python/aces_ocio/utilities.py b/aces_1.0.0/python/aces_ocio/utilities.py index 75222f1..b64cc62 100644 --- a/aces_1.0.0/python/aces_ocio/utilities.py +++ b/aces_1.0.0/python/aces_ocio/utilities.py @@ -11,7 +11,7 @@ import os import re from collections import OrderedDict -import PyOpenColorIO as OCIO +import PyOpenColorIO as ocio __author__ = 'ACES Developers' __copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers' @@ -38,13 +38,13 @@ class ColorSpace(object): name, aliases=[], description=None, - bit_depth=OCIO.Constants.BIT_DEPTH_F32, + bit_depth=ocio.Constants.BIT_DEPTH_F32, equality_group=None, family=None, is_data=False, to_reference_transforms=[], from_reference_transforms=[], - allocation_type=OCIO.Constants.ALLOCATION_UNIFORM, + allocation_type=ocio.Constants.ALLOCATION_UNIFORM, allocation_vars=[0, 1]): """ Object description. @@ -147,9 +147,8 @@ def files_walker(directory, filters_in=None, filters_out=None, flags=0): Return value description. """ - for parent_directory, directories, files in os.walk(directory, - topdown=False, - followlinks=True): + for parent_directory, directories, files in os.walk( + directory, topdown=False, followlinks=True): for file in files: path = os.path.join(parent_directory, file) if os.path.isfile(path): diff --git a/aces_1.0.0/python/bin/create_aces_config b/aces_1.0.0/python/bin/create_aces_config index b889dd5..8a1a10a 100755 --- a/aces_1.0.0/python/bin/create_aces_config +++ b/aces_1.0.0/python/bin/create_aces_config @@ -12,7 +12,7 @@ import sys sys.path.append(os.path.join(os.path.dirname(__file__), '..')) -from aces_ocio.create_aces_config import main +from aces_ocio.aces_config import main __author__ = 'ACES Developers' __copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers' -- 1.7.10.4