Merge branch 'feature/v0.1.14' into develop

Author: KelSolaar

app.py

@@ -5,8 +5,10 @@
 
 import dash
 import os
+from colour.hints import Optional
 from flask import Flask
 
+
 __author__ = "Colour Developers"
 __copyright__ = "Copyright 2018 Colour Developers"
 __license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
@@ -30,7 +32,7 @@
 *Flask* server hosting the *Dash* app.
 """
 
-SERVER_URL: str = os.environ.get("COLOUR_DASH_SERVER")
+SERVER_URL: Optional[str] = os.environ.get("COLOUR_DASH_SERVER")
 """
 Server url used to construct permanent links for the individual apps.
 """

apps/common.py

@@ -5,7 +5,7 @@
 
 import colour
 
-from colour.hints import ArrayLike, Dict, Integer, List
+from colour.hints import ArrayLike, Dict, Integer, Iterable, List
 
 __author__ = "Colour Developers"
 __copyright__ = "Copyright 2018 Colour Developers"
@@ -87,10 +87,10 @@ def nuke_format_matrix(M: ArrayLike, decimals: Integer = 10) -> str:
         *The Foundry Nuke* formatted matrix.
     """
 
-    def pretty(x: ArrayLike) -> str:
-        """
-        Prettify given number.
-        """
+    M = colour.utilities.as_float_array(M)
+
+    def pretty(x: Iterable) -> str:
+        """Prettify given number."""
 
         return " ".join(map(f"{{: 0.{decimals}f}}".format, x))
 

apps/rgb_colourspace_chromatically_adapted_primaries.py

@@ -55,7 +55,7 @@
 App description.
 """
 
-APP_UID: str = hash(APP_NAME)
+APP_UID: Integer = hash(APP_NAME)
 """
 App unique id.
 """
@@ -132,7 +132,7 @@
                                 A(
                                     "Permalink",
                                     href=urllib.parse.urljoin(
-                                        SERVER_URL, APP_PATH
+                                        str(SERVER_URL), APP_PATH
                                     ),
                                     target="_blank",
                                 )
@@ -221,8 +221,8 @@ def set_primaries_output(
         threshold=sys.maxsize,
     ):
         if formatter == "str":
-            P = str(P)
+            P_f = str(P)
         elif formatter == "repr":
-            P = repr(P)
+            P_f = repr(P)
 
-        return P
+        return P_f

apps/rgb_colourspace_transformation_matrix.py

@@ -57,7 +57,7 @@
 App description.
 """
 
-APP_UID: str = hash(APP_NAME)
+APP_UID: Integer = hash(APP_NAME)
 """
 App unique id.
 """
@@ -140,7 +140,7 @@
                                 A(
                                     "Permalink",
                                     href=urllib.parse.urljoin(
-                                        SERVER_URL, APP_PATH
+                                        str(SERVER_URL), APP_PATH
                                     ),
                                     target="_blank",
                                 )
@@ -228,9 +228,9 @@ def set_RGB_to_RGB_matrix_output(
         threshold=sys.maxsize,
     ):
         if formatter == "str":
-            M = str(M)
+            M_f = str(M)
         elif formatter == "repr":
-            M = repr(M)
+            M_f = repr(M)
         else:
 
             def slugify(string: str) -> str:
@@ -243,12 +243,13 @@ def slugify(string: str) -> str:
                 string = re.sub(pattern, "_", string)
                 return string
 
-            M = NUKE_COLORMATRIX_NODE_TEMPLATE.format(
+            M_f = NUKE_COLORMATRIX_NODE_TEMPLATE.format(
                 nuke_format_matrix(M, decimals),
                 (
                     f"{slugify(input_colourspace)}"
                     f"__to__"
                     f"{slugify(output_colourspace)}"
                 ),
             )
-        return M
+
+        return M_f

pyproject.toml

@@ -55,6 +55,7 @@ coveralls = { version = "*", optional = true }  # Development dependency.
 flake8 = { version = "*", optional = true }  # Development dependency.
 flynt = { version = "*", optional = true }  # Development dependency.
 invoke = { version = "*", optional = true }  # Development dependency.
+mypy = { version = "*", optional = true }  # Development dependency.
 pre-commit = { version = "*", optional = true }  # Development dependency.
 pydocstyle = { version = "*", optional = true }  # Development dependency.
 pytest = { version = "*", optional = true }  # Development dependency.
@@ -68,7 +69,8 @@ coveralls = "*"
 flake8 = "*"
 flynt = "*"
 invoke = "*"
-pre = "*"
+mypy = "*"
+pre-commit = "*"
 pydocstyle = "*"
 pytest = "*"
 pytest-cov = "*"
@@ -82,7 +84,8 @@ development = [
     "flake8",
     "flynt",
     "invoke",
-    "pre",
+    "mypy",
+    "pre-commit",
     "pydocstyle",
     "pytest",
     "pytest-cov",

requirements.txt

@@ -3,6 +3,7 @@ attrs==21.4.0
 black==22.3.0
 Brotli==1.0.9
 certifi==2021.10.8
+cfgv==3.3.1
 charset-normalizer==2.0.12
 click==8.1.3
 colour-science==0.4.1
@@ -13,12 +14,15 @@ dash-core-components==2.0.0
 dash-html-components==2.0.0
 dash-renderer==1.9.1
 dash-table==5.0.0
+distlib==0.3.4
 docopt==0.6.2
+filelock==3.6.0
 flake8==4.0.1
 Flask==2.1.2
 Flask-Compress==1.12
 flynt==0.76
 gunicorn==20.1.0
+identify==2.5.0
 idna==3.3
 imageio==2.18.0
 importlib-metadata==4.11.3
@@ -29,6 +33,7 @@ Jinja2==3.1.2
 MarkupSafe==2.1.1
 mccabe==0.6.1
 mypy-extensions==0.4.3
+nodeenv==1.6.0
 numpy==1.22.3
 packaging==21.3
 pathspec==0.9.0
@@ -38,6 +43,7 @@ platformdirs==2.5.2
 plotly==5.7.0
 pluggy==1.0.0
 pre==1.3.0
+pre-commit==2.18.1
 py==1.11.0
 pycodestyle==2.8.0
 pydocstyle==6.1.1
@@ -46,16 +52,19 @@ pyparsing==3.0.8
 pytest==7.1.2
 pytest-cov==3.0.0
 pyupgrade==2.32.0
+PyYAML==6.0
 requests==2.27.1
 scipy==1.8.0
 setuptools==61.3.1
 six==1.16.0
 snowballstemmer==2.2.0
 tenacity==8.0.1
 tokenize-rt==4.2.1
+toml==0.10.2
 tomli==2.0.1
 typing_extensions==4.2.0
 urllib3==1.26.9
+virtualenv==20.14.1
 Werkzeug==2.1.2
 wheel==0.37.1
 zipp==3.8.0