Merge branch 'release/v0.1.12'

KelSolaar · KelSolaar · commit adb11c7b4adf · 2020-12-05T18:23:31.000+13:00
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -36,7 +36,7 @@ This Code of Conduct applies within all project spaces, and it also applies when
 ## Enforcement
 
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting Thomas Mansencal and Michael Mauderer via email at thomas.mansencal@gmail.com and michael@mauderer.me respectively. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting Thomas Mansencal and Michael Mauderer via email at thomas@colour-science.org and michael@colour-science.org respectively. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project’s leadership.
 
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -12,6 +12,6 @@ About
 -----
 
 | **Colour - Dash** by Colour Developers
-| Copyright © 2018-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
+| Copyright © 2018-2020 – Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
 | This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
 | `https://github.com/colour-science/colour-dash <https://github.com/colour-science/colour-dash>`__
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.6
+FROM python:3.8
 
 WORKDIR /tmp
 COPY ./requirements.txt /tmp
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2018, Colour Developers
+Copyright (C) 2018-2020, Colour Developers
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.rst b/README.rst
@@ -49,6 +49,6 @@ About
 -----
 
 | **Colour - Dash** by Colour Developers
-| Copyright © 2018-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
+| Copyright © 2018-2020 – Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
 | This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
 | `https://github.com/colour-science/colour-dash <https://github.com/colour-science/colour-dash>`__
diff --git a/app.py b/app.py
@@ -4,24 +4,22 @@
 ===========
 """
 
-from __future__ import division, unicode_literals
-
 import dash
 import os
 from flask import Flask
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
+__copyright__ = 'Copyright (C) 2018-2020 - Colour Developers'
 __license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
-__email__ = 'colour-science@googlegroups.com'
+__email__ = 'colour-developers@colour-science.org'
 __status__ = 'Production'
 
 __application_name__ = 'Colour - Dash'
 
 __major_version__ = '0'
 __minor_version__ = '1'
-__change_version__ = '11'
+__change_version__ = '12'
 __version__ = '.'.join(
     (__major_version__,
      __minor_version__,
diff --git a/apps/common.py b/apps/common.py
@@ -4,31 +4,30 @@
 ======
 """
 
-from __future__ import division, unicode_literals
-
 import colour
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
+__copyright__ = 'Copyright (C) 2018-2020 - Colour Developers'
 __license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
-__email__ = 'colour-science@googlegroups.com'
+__email__ = 'colour-developers@colour-science.org'
 __status__ = 'Production'
 
 __all__ = [
-    'RGB_COLOURSPACES_OPTIONS', 'CHROMATIC_ADAPTATION_TRANSFORM_OPTIONS',
+    'RGB_COLOURSPACE_OPTIONS', 'CHROMATIC_ADAPTATION_TRANSFORM_OPTIONS',
     'ILLUMINANTS_OPTIONS', 'NUKE_COLORMATRIX_NODE_TEMPLATE',
     'nuke_format_matrix'
 ]
 
-RGB_COLOURSPACES_OPTIONS = [{
+RGB_COLOURSPACE_OPTIONS = [{
     'label': key,
     'value': key
-} for key in sorted(colour.RGB_COLOURSPACES.keys())]
+} for key in sorted(colour.RGB_COLOURSPACES.keys())
+                           if key not in ('aces', 'adobe1998', 'prophoto')]
 """
 *RGB* colourspace options for a :class:`Dropdown` class instance.
 
-RGB_COLOURSPACES_OPTIONS : list
+RGB_COLOURSPACE_OPTIONS : list
 """
 
 CHROMATIC_ADAPTATION_TRANSFORM_OPTIONS = [{
@@ -45,8 +44,8 @@
 ILLUMINANTS_OPTIONS = [{
     'label': key,
     'value': key
-} for key in sorted(colour.ILLUMINANTS['CIE 1931 2 Degree Standard Observer']
-                    .keys())]
+} for key in sorted(colour.CCS_ILLUMINANTS[
+    'CIE 1931 2 Degree Standard Observer'].keys())]
 """
 *CIE 1931 2 Degree Standard Observer* illuminant options for a
 :class:`Dropdown`class instance.
diff --git a/apps/rgb_colourspace_chromatically_adapted_primaries.py b/apps/rgb_colourspace_chromatically_adapted_primaries.py
@@ -4,8 +4,6 @@
 ===========================================================
 """
 
-from __future__ import division, unicode_literals
-
 import sys
 import urllib.parse
 from dash.dependencies import Input, Output
@@ -16,13 +14,13 @@
 
 from app import APP, SERVER_URL
 from apps.common import (CHROMATIC_ADAPTATION_TRANSFORM_OPTIONS,
-                         ILLUMINANTS_OPTIONS, RGB_COLOURSPACES_OPTIONS)
+                         ILLUMINANTS_OPTIONS, RGB_COLOURSPACE_OPTIONS)
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
+__copyright__ = 'Copyright (C) 2018-2020 - Colour Developers'
 __license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
-__email__ = 'colour-science@googlegroups.com'
+__email__ = 'colour-developers@colour-science.org'
 __status__ = 'Production'
 
 __all__ = [
@@ -68,8 +66,8 @@
         H5(children='Colourspace'),
         Dropdown(
             id='colourspace-{0}'.format(APP_UID),
-            options=RGB_COLOURSPACES_OPTIONS,
-            value=RGB_COLOURSPACES_OPTIONS[0]['value'],
+            options=RGB_COLOURSPACE_OPTIONS,
+            value=RGB_COLOURSPACE_OPTIONS[0]['value'],
             clearable=False,
             className='app-widget'),
         H5(children='Illuminant'),
@@ -180,8 +178,8 @@ def set_primaries_output(colourspace, illuminant,
     P = colour.chromatically_adapted_primaries(
         colour.RGB_COLOURSPACES[colourspace].primaries,
         colour.RGB_COLOURSPACES[colourspace].whitepoint,
-        colour.ILLUMINANTS['CIE 1931 2 Degree Standard Observer'][illuminant],
-        chromatic_adaptation_transform)
+        colour.CCS_ILLUMINANTS['CIE 1931 2 Degree Standard Observer'][
+            illuminant], chromatic_adaptation_transform)
 
     with colour.utilities.numpy_print_options(
             formatter={'float': ('{{: 0.{0}f}}'.format(decimals)).format},
diff --git a/apps/rgb_colourspace_transformation_matrix.py b/apps/rgb_colourspace_transformation_matrix.py
@@ -4,8 +4,6 @@
 =================================================
 """
 
-from __future__ import division, unicode_literals
-
 import urllib.parse
 import sys
 from dash.dependencies import Input, Output
@@ -17,13 +15,13 @@
 from app import APP, SERVER_URL
 from apps.common import (CHROMATIC_ADAPTATION_TRANSFORM_OPTIONS,
                          NUKE_COLORMATRIX_NODE_TEMPLATE,
-                         RGB_COLOURSPACES_OPTIONS, nuke_format_matrix)
+                         RGB_COLOURSPACE_OPTIONS, nuke_format_matrix)
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
+__copyright__ = 'Copyright (C) 2018-2020 - Colour Developers'
 __license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
-__email__ = 'colour-science@googlegroups.com'
+__email__ = 'colour-developers@colour-science.org'
 __status__ = 'Production'
 
 __all__ = [
@@ -69,15 +67,15 @@
         H5(children='Input Colourspace'),
         Dropdown(
             id='input-colourspace-{0}'.format(APP_UID),
-            options=RGB_COLOURSPACES_OPTIONS,
-            value=RGB_COLOURSPACES_OPTIONS[0]['value'],
+            options=RGB_COLOURSPACE_OPTIONS,
+            value=RGB_COLOURSPACE_OPTIONS[0]['value'],
             clearable=False,
             className='app-widget'),
         H5(children='Output Colourspace'),
         Dropdown(
             id='output-colourspace-{0}'.format(APP_UID),
-            options=RGB_COLOURSPACES_OPTIONS,
-            value=RGB_COLOURSPACES_OPTIONS[0]['value'],
+            options=RGB_COLOURSPACE_OPTIONS,
+            value=RGB_COLOURSPACE_OPTIONS[0]['value'],
             clearable=False,
             className='app-widget'),
         H5(children='Chromatic Adaptation Transform'),
@@ -185,7 +183,7 @@ def set_RGB_to_RGB_matrix_output(input_colourspace, output_colourspace,
         Colour transformation matrix.
     """
 
-    M = colour.RGB_to_RGB_matrix(colour.RGB_COLOURSPACES[input_colourspace],
+    M = colour.matrix_RGB_to_RGB(colour.RGB_COLOURSPACES[input_colourspace],
                                  colour.RGB_COLOURSPACES[output_colourspace],
                                  chromatic_adaptation_transform)
 
diff --git a/index.py b/index.py
@@ -4,8 +4,6 @@
 =====
 """
 
-from __future__ import division, unicode_literals
-
 from dash.dependencies import Input, Output
 from dash_core_components import Link, Location, Markdown
 from dash_html_components import A, Div, H3, P
@@ -15,10 +13,10 @@
 from app import APP, SERVER  # noqa
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
+__copyright__ = 'Copyright (C) 2018-2020 - Colour Developers'
 __license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
-__email__ = 'colour-science@googlegroups.com'
+__email__ = 'colour-developers@colour-science.org'
 __status__ = 'Production'
 
 __all__ = ['load_app']
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,9 +1,10 @@
 [tool.poetry]
 name = "colour-dash"
-version = "0.1.9"
+version = "0.1.12"
 description = "Various colour science Dash apps built on top of Colour"
 license = "BSD-3-Clause"
-authors = [ "Colour Developers" ]
+authors = [ "Colour Developers <colour-developers@colour-science.org>" ]
+maintainers = [ "Colour Developers <colour-developers@colour-science.org>" ]
 readme = 'README.rst'
 repository = "https://github.com/colour-science/colour-dash"
 homepage = "https://www.colour-science.org/"
@@ -38,8 +39,8 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.5"
-colour-science = "^0.3.14"
+python = "^3.6"
+colour-science = "^0.3.16"
 dash = "*"
 dash-core-components = "*"
 dash-html-components = "*"
diff --git a/requirements.txt b/requirements.txt
@@ -1,50 +1,48 @@
-aspy.yaml==1.3.0
-atomicwrites==1.3.0
-attrs==19.3.0
-cfgv==2.0.1
-Click==7.0
-colour-science==0.3.14
-coverage==4.5.4
-dash==1.5.1
-dash-core-components==1.4.0
-dash-html-components==1.0.1
-dash-renderer==1.2.0
-dash-table==4.5.0
-entrypoints==0.3
-flake8==3.7.9
-Flask==1.1.1
-Flask-Compress==1.4.0
+appdirs==1.4.4
+attrs==20.3.0
+Brotli==1.0.9
+cfgv==3.0.0
+click==7.1.2
+colour-science==0.3.16
+coverage==5.3
+dash==1.17.0
+dash-core-components==1.13.0
+dash-html-components==1.1.1
+dash-renderer==1.8.3
+dash-table==4.11.0
+distlib==0.3.1
+filelock==3.0.12
+flake8==3.8.4
+Flask==1.1.2
+Flask-Compress==1.8.0
 future==0.18.2
-gunicorn==19.9.0
-identify==1.4.7
-imageio==2.6.1
-importlib-metadata==0.23
-invoke==1.3.0
+gunicorn==20.0.4
+identify==1.5.10
+imageio==2.9.0
+iniconfig==1.1.1
+invoke==1.4.1
 itsdangerous==1.1.0
-Jinja2==2.10.3
+Jinja2==2.11.2
 MarkupSafe==1.1.1
 mccabe==0.6.1
-more-itertools==7.2.0
-nodeenv==1.3.3
+nodeenv==1.5.0
 nose==1.3.7
-numpy==1.17.3
-packaging==19.2
-Pillow==6.2.1
-plotly==4.2.1
-pluggy==0.13.0
-pre-commit==1.20.0
-py==1.8.0
-pycodestyle==2.5.0
-pyflakes==2.1.1
-pyparsing==2.4.2
-pytest==5.2.2
-PyYAML==5.1.2
+numpy==1.19.4
+packaging==20.7
+Pillow==8.0.1
+plotly==4.13.0
+pluggy==0.13.1
+pre-commit==2.1.1
+py==1.9.0
+pycodestyle==2.6.0
+pyflakes==2.2.0
+pyparsing==2.4.7
+pytest==6.1.2
+PyYAML==5.3.1
 retrying==1.3.3
-scipy==1.3.1
-six==1.12.0
-toml==0.10.0
-virtualenv==16.7.7
-wcwidth==0.1.7
-Werkzeug==0.16.0
+scipy==1.5.4
+six==1.15.0
+toml==0.10.2
+virtualenv==20.2.1
+Werkzeug==1.0.1
 yapf==0.23.0
-zipp==0.6.0
diff --git a/tasks.py b/tasks.py
@@ -4,8 +4,6 @@
 ==============
 """
 
-from __future__ import print_function, unicode_literals
-
 from invoke import task
 from invoke.exceptions import Failure
 
@@ -14,10 +12,10 @@
 import app
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
+__copyright__ = 'Copyright (C) 2018-2020 - Colour Developers'
 __license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
-__email__ = 'colour-science@googlegroups.com'
+__email__ = 'colour-developers@colour-science.org'
 __status__ = 'Production'
 
 __all__ = [
@@ -108,7 +106,7 @@ def formatting(ctx, yapf=False):
 @task
 def requirements(ctx):
     """
-    Export the *requirements.txt* file.
+    Exports the *requirements.txt* file.
 
     Parameters
     ----------
@@ -122,8 +120,9 @@ def requirements(ctx):
     """
 
     message_box('Exporting "requirements.txt" file...')
-    ctx.run('poetry run pip freeze | grep -v '
-            '"github.com/colour-science/colour-dash" > requirements.txt')
+    ctx.run('poetry run pip freeze | '
+            'egrep -v "github.com/colour-science|enum34" '
+            '> requirements.txt')
 
 
 @task(requirements)

-Original file line number
+Diff line change
 -----
 | **Colour - Dash** by Colour Developers
 -| Copyright © 2018-2019 – Colour Developers – `colour-[email protected] <colour-[email protected]>`__
 +| Copyright © 2018-2020 – Colour Developers – `colour-[email protected] <colour-[email protected]>`__
 | This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
 | `https://github.com/colour-science/colour-dash <https://github.com/colour-science/colour-dash>`__
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.6`
	`1`	`+FROM python:3.8`
`2`	`2`
`3`	`3`	`WORKDIR /tmp`
`4`	`4`	`COPY ./requirements.txt /tmp`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (C) 2018, Colour Developers`
	`1`	`+Copyright (C) 2018-2020, Colour Developers`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without`