PR: Fix Inactive Colorspaces Definitions (#94)

* Implement initial support for Python 3.11.

Signed-off-by: Thomas Mansencal <[email protected]>

* Fix incorrect inactive colorspaces definitions.

Signed-off-by: Thomas Mansencal <[email protected]>

---------

Signed-off-by: Thomas Mansencal <[email protected]>

Author: KelSolaar

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

@@ -22,6 +22,10 @@ jobs:
         echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
         echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
       shell: bash
+    - name: Set up Python 3.9 for Pre-Commit
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.9
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     rev: v2.31.0
     hooks:
     -   id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
 -   repo: https://github.com/ikamensh/flynt/
     rev: '0.76'
     hooks:
@@ -12,7 +12,7 @@ repos:
     rev: 22.3.0
     hooks:
     - id: black
-      language_version: python3.8
+      language_version: python3.9
 -   repo: https://github.com/PyCQA/flake8
     rev: 4.0.1
     hooks:

opencolorio_config_aces/config/cg/generate/config.py

@@ -1116,6 +1116,18 @@ def view_filterer(transform):
         if a["name"] == "Raw"
     )
 
+    # Inactive Colorspaces Filtering
+    colorspace_named_transform_names = [a["name"] for a in data.colorspaces]
+    inactive_colorspaces = []
+    for colorspace in data.inactive_colorspaces:
+        if colorspace not in colorspace_named_transform_names:
+            logger.info(f'Removing "{colorspace}" inactive colorspace.')
+            continue
+
+        inactive_colorspaces.append(colorspace)
+
+    data.inactive_colorspaces = inactive_colorspaces
+
     # Roles Filtering & Update
     for role in (
         # A config contains multiple possible "Rendering" color spaces.

opencolorio_config_aces/config/generation/common.py

@@ -124,8 +124,12 @@ class ConfigData:
     default_view_transform
     """
 
-    schema_version: ProfileVersion = ProfileVersion(1, 0)
-    profile_version: ProfileVersion = PROFILE_VERSION_DEFAULT
+    schema_version: ProfileVersion = field(
+        default_factory=lambda: ProfileVersion(1, 0)
+    )
+    profile_version: ProfileVersion = field(
+        default_factory=lambda: PROFILE_VERSION_DEFAULT
+    )
     name: str = field(default_factory=str)
     description: str = (
         'An "OpenColorIO" config generated by "OpenColorIO-Config-ACES".'

opencolorio_config_aces/config/reference/generate/config.py

@@ -1207,7 +1207,8 @@ def generate_config_aces(
                 )
                 display["transforms_data"] = [transform_data]
                 display_name = display["name"]
-                inactive_colorspaces.append(display["name"])
+                if display_name not in inactive_colorspaces:
+                    inactive_colorspaces.append(display_name)
 
                 if display_name not in display_names:
                     displays.append(display)

pyproject.toml

@@ -18,7 +18,7 @@ keywords = [
 ]
 
 [tool.poetry.dependencies]
-python = ">= 3.9, < 3.11"
+python = ">= 3.9, < 3.12"
 # numpy = ">= 1.19, < 2"
 opencolorio = ">= 2, < 3"
 requests = ">= 2, < 3"

requirements.txt

@@ -1,90 +1,87 @@
-alabaster==0.7.12
+alabaster==0.7.13
 astor==0.8.1
-attrs==22.1.0
-Babel==2.10.3
-beautifulsoup4==4.11.1
-black==22.10.0
-bleach==5.0.1
-certifi==2022.9.24
+attrs==22.2.0
+Babel==2.11.0
+beautifulsoup4==4.11.2
+black==23.1.0
+bleach==6.0.0
+certifi==2022.12.7
 cfgv==3.3.1
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
 click==8.1.3
-colour-science==0.4.1
-commonmark==0.9.1
+colour-science==0.4.2
 coverage==6.5.0
 coveralls==3.3.1
 distlib==0.3.6
 docopt==0.6.2
 docutils==0.17.1
-filelock==3.8.0
-flake8==5.0.4
-flynt==0.76
-identify==2.5.6
+filelock==3.9.0
+flake8==6.0.0
+flynt==0.77
+identify==2.5.18
 idna==3.4
-imageio==2.22.1
+imageio==2.25.1
 imagesize==1.4.1
-importlib-metadata==5.0.0
-iniconfig==1.1.1
-invoke==1.7.3
+importlib-metadata==6.0.0
+iniconfig==2.0.0
+invoke==2.0.0
 jaraco.classes==3.2.3
 Jinja2==3.1.2
 jsonpickle==2.2.0
-keyring==23.9.3
-MarkupSafe==2.1.1
+keyring==23.13.1
+markdown-it-py==2.1.0
+MarkupSafe==2.1.2
 mccabe==0.7.0
-more-itertools==8.14.0
-mypy==0.982
-mypy-extensions==0.4.3
-networkx==2.8.7
+mdurl==0.1.2
+more-itertools==9.0.0
+mypy==1.0.0
+mypy-extensions==1.0.0
+networkx==3.0
 nodeenv==1.7.0
-numpy==1.23.3
-opencolorio==2.1.2
-packaging==21.3
-pathspec==0.10.1
-Pillow==9.2.0
-pip==22.2.2
-pkginfo==1.8.3
-platformdirs==2.5.2
+numpy==1.24.2
+opencolorio==2.2.1
+packaging==23.0
+pathspec==0.11.0
+Pillow==9.4.0
+pip==22.3.1
+pkginfo==1.9.6
+platformdirs==3.0.0
 pluggy==1.0.0
-pre-commit==2.20.0
-py==1.11.0
-pycodestyle==2.9.1
-pydata-sphinx-theme==0.11.0
-pydocstyle==6.1.1
-pyflakes==2.5.0
-Pygments==2.13.0
-pygraphviz==1.10
-pyparsing==3.0.9
-pytest==7.1.3
+pre-commit==3.0.4
+pycodestyle==2.10.0
+pydata-sphinx-theme==0.12.0
+pydocstyle==6.3.0
+pyflakes==3.0.1
+Pygments==2.14.0
+pytest==7.2.1
 pytest-cov==4.0.0
-pytz==2022.4
-pyupgrade==3.0.0
+pytz==2022.7.1
+pyupgrade==3.3.1
 PyYAML==6.0
-readme-renderer==37.2
-requests==2.28.1
-requests-toolbelt==0.10.0
+readme-renderer==37.3
+requests==2.28.2
+requests-toolbelt==0.10.1
 restructuredtext-lint==1.4.0
 rfc3986==2.0.0
-rich==12.6.0
-scipy==1.9.1
-setuptools==65.3.0
+rich==13.3.1
+scipy==1.10.0
+setuptools==67.2.0
 six==1.16.0
 snowballstemmer==2.2.0
 soupsieve==2.3.2.post1
 Sphinx==4.5.0
-sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-applehelp==1.0.4
 sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==2.0.0
+sphinxcontrib-htmlhelp==2.0.1
 sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.3
 sphinxcontrib-serializinghtml==1.1.5
 tokenize-rt==5.0.0
-toml==0.10.2
 tomli==2.0.1
-twine==4.0.1
+twine==4.0.2
 typing_extensions==4.4.0
-urllib3==1.26.12
-virtualenv==20.16.5
+urllib3==1.26.14
+virtualenv==20.19.0
 webencodings==0.5.1
-wheel==0.37.1
-zipp==3.8.1
+wheel==0.38.4
+zipp==3.13.0

tasks.py

@@ -10,7 +10,6 @@
 import os
 
 import requests
-from invoke import Context, task
 from invoke.exceptions import Failure
 from pathlib import Path
 import opencolorio_config_aces
@@ -25,6 +24,13 @@
 )
 from opencolorio_config_aces.utilities import google_sheet_title, message_box
 
+import inspect
+
+if not hasattr(inspect, "getargspec"):
+    inspect.getargspec = inspect.getfullargspec
+
+from invoke import Context, task
+
 __author__ = "OpenColorIO Contributors"
 __copyright__ = "Copyright Contributors to the OpenColorIO Project."
 __license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
@@ -86,31 +92,6 @@
 CONTAINER = PYPI_PACKAGE_NAME
 
 
-def _patch_invoke_annotations_support():
-    """See https://github.com/pyinvoke/invoke/issues/357."""
-
-    import invoke
-    from unittest.mock import patch
-    from inspect import getfullargspec, ArgSpec
-
-    def patched_inspect_getargspec(function):
-        spec = getfullargspec(function)
-        return ArgSpec(*spec[0:4])
-
-    org_task_argspec = invoke.tasks.Task.argspec
-
-    def patched_task_argspec(*args, **kwargs):
-        with patch(
-            target="inspect.getargspec", new=patched_inspect_getargspec
-        ):
-            return org_task_argspec(*args, **kwargs)
-
-    invoke.tasks.Task.argspec = patched_task_argspec
-
-
-_patch_invoke_annotations_support()
-
-
 @task
 def clean(
     ctx: Context,