Merge branch 'feature/v0.3.15' into develop

KelSolaar · KelSolaar · commit 6de4c330c1b7 · 2020-01-25T18:03:43.000+13:00
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04, macOS-latest]
-        python-version: [2.7, 3.6, 3.7, 3.8]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v1
@@ -42,7 +42,6 @@ jobs:
     - name: Ubuntu - Update OS & Install APT Dependencies
       if: matrix.os == 'ubuntu-18.04'
       run: |
-        sudo apt-get update
         sudo apt-get --yes install libboost-all-dev libilmbase-dev libopenexr-dev libpng-dev libtiff5-dev
     - name: Install Poetry
       run: |
@@ -92,7 +91,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        python-version: [2.7, 3.6, 3.7]
+        python-version: [2.7, 3.5, 3.6, 3.7]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v1
diff --git a/BIBLIOGRAPHY.bib b/BIBLIOGRAPHY.bib
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -9,7 +9,7 @@ The releases changes are available on Github: https://github.com/colour-science/
 About
 -----
 
-| **Colour** by Colour Developers - 2013-2020
+| **Colour** by Colour Developers
 | Copyright © 2013-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 <https://github.com/colour-science/colour>`__
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -9,7 +9,7 @@ If you would like to contribute to **Colour**, please refer to the following gui
 About
 -----
 
-| **Colour** by Colour Developers - 2013-2020
+| **Colour** by Colour Developers
 | Copyright © 2013-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 <https://github.com/colour-science/colour>`__
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -190,6 +190,7 @@ Issues & Discussions
 -   @MarcusCalhoun-Lopez
 -   @matthiasbirkich
 -   @meshing
+-   @mokincha
 -   @monkeywithacupcake
 -   @Myndex
 -   @naavis
@@ -216,7 +217,7 @@ Issues & Discussions
 About
 -----
 
-| **Colour** by Colour Developers - 2013-2020
+| **Colour** by Colour Developers
 | Copyright © 2013-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 <https://github.com/colour-science/colour>`__
diff --git a/README.rst b/README.rst
@@ -19,8 +19,8 @@
 .. |version| image:: https://img.shields.io/pypi/v/colour-science.svg?style=flat-square
     :target: https://pypi.org/project/colour-science
     :alt: Package Version
-.. |zenodo| image:: https://img.shields.io/badge/DOI-10.5281/zenodo.3519603-blue.svg?style=flat-square
-    :target: https://dx.doi.org/10.5281/zenodo.3519603
+.. |zenodo| image:: https://img.shields.io/badge/DOI-10.5281/zenodo.3627408-blue.svg?style=flat-square
+    :target: https://dx.doi.org/10.5281/zenodo.3627408
     :alt: DOI
 
 .. end-badges
@@ -1318,7 +1318,7 @@ Thank You!
 About
 -----
 
-| **Colour** by Colour Developers - 2013-2020
+| **Colour** by Colour Developers
 | Copyright © 2013-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 <https://github.com/colour-science/colour>`__
diff --git a/TODO.rst b/TODO.rst
@@ -6,12 +6,12 @@ TODO
 
 -   colour/__init__.py
 
-    -   Line 306 : # TODO: Remove legacy printing support when deemed appropriate.
+    -   Line 312 : # TODO: Remove legacy printing support when deemed appropriate.
 
 
 -   colour/colorimetry/spectrum.py
 
-    -   Line 1112 : # TODO: Provide support for fractional interval like 0.1, etc...
+    -   Line 1131 : # TODO: Provide support for fractional interval like 0.1, etc...
 
 
 -   colour/colorimetry/tristimulus.py
@@ -21,8 +21,8 @@ TODO
 
 -   colour/colorimetry/tests/test_spectrum.py
 
-    -   Line 1457 : # TODO: Remove statement whenever we make "Scipy" 0.19.0 the minimum version. Skipping tests because of "Scipy" 0.19.0 interpolation code changes.
-    -   Line 1666 : # TODO: Remove statement whenever we make "Scipy" 0.19.0 the minimum version. Skipping tests because of "Scipy" 0.19.0 interpolation code changes.
+    -   Line 1486 : # TODO: Remove statement whenever we make "Scipy" 0.19.0 the minimum version. Skipping tests because of "Scipy" 0.19.0 interpolation code changes.
+    -   Line 1695 : # TODO: Remove statement whenever we make "Scipy" 0.19.0 the minimum version. Skipping tests because of "Scipy" 0.19.0 interpolation code changes.
 
 
 -   colour/appearance/ciecam02.py
@@ -69,8 +69,8 @@ TODO
 
 -   colour/io/luts/lut.py
 
-    -   Line 126 : # TODO: Re-enable when dropping Python 2.7. pylint: disable=E1121
-    -   Line 2009 : # TODO: Implement support for non-uniform domain, e.g. "cinespace" LUTs.
+    -   Line 129 : # TODO: Re-enable when dropping Python 2.7. pylint: disable=E1121
+    -   Line 2012 : # TODO: Implement support for non-uniform domain, e.g. "cinespace" LUTs.
 
 
 -   colour/graph/conversion.py
@@ -96,8 +96,8 @@ TODO
 
 -   colour/models/rgb/transfer_functions/tests/test__init__.py
 
-    -   Line 38 : # TODO: Use "assertWarns" when dropping Python 2.7.
-    -   Line 55 : # TODO: Use "assertWarns" when dropping Python 2.7.
+    -   Line 39 : # TODO: Use "assertWarns" when dropping Python 2.7.
+    -   Line 56 : # TODO: Use "assertWarns" when dropping Python 2.7.
 
 
 -   colour/utilities/verbose.py
@@ -107,7 +107,7 @@ TODO
 
 -   colour/utilities/common.py
 
-    -   Line 569 : # TODO: Remove when dropping Python 2.7.
+    -   Line 601 : # TODO: Remove when dropping Python 2.7.
 
 
 -   colour/utilities/array.py
@@ -127,7 +127,8 @@ TODO
 
 -   colour/plotting/common.py
 
-    -   Line 821 : # TODO: Consider using "MutableMapping" here.
+    -   Line 666 : # TODO: Reassess according to https://github.com/matplotlib/matplotlib/issues/1077
+    -   Line 783 : # TODO: Consider using "MutableMapping" here.
 
 
 -   colour/characterisation/correction.py
@@ -137,7 +138,7 @@ TODO
 
 -   colour/notation/munsell.py
 
-    -   Line 1067 : # TODO: Consider refactoring implementation.
+    -   Line 1081 : # TODO: Consider refactoring implementation.
 
 
 -   colour/continuous/signal.py
@@ -179,6 +180,6 @@ About
 -----
 
 | **Colour** by Colour Developers
-| Copyright © 2013-2020 – Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`_
+| Copyright © 2013-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 <https://github.com/colour-science/colour>`_
+| `https://github.com/colour-science/colour <https://github.com/colour-science/colour>`__
diff --git a/colour/__init__.py b/colour/__init__.py
@@ -154,6 +154,12 @@
     is_within_mesh_volume, is_within_pointer_gamut, is_within_visible_spectrum)
 from .graph import describe_conversion_path, convert
 
+from colour.utilities import is_matplotlib_installed
+
+# Exposing "colour.plotting" sub-package if "Matplotlib" is available.
+if is_matplotlib_installed():
+    import colour.plotting as plotting  # noqa
+
 __author__ = 'Colour Developers'
 __copyright__ = 'Copyright (C) 2013-2020 - Colour Developers'
 __license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
@@ -298,7 +304,7 @@
 
 __major_version__ = '0'
 __minor_version__ = '3'
-__change_version__ = '14'
+__change_version__ = '15'
 __version__ = '.'.join(
     (__major_version__,
      __minor_version__,
diff --git a/colour/algebra/regression.py b/colour/algebra/regression.py
@@ -21,7 +21,7 @@
 import numpy as np
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2013 - 2014 - Colour Developers'
+__copyright__ = 'Copyright (C) 2013-2020 - Colour Developers'
 __license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
 __email__ = 'colour-developers@colour-science.org'
diff --git a/colour/blindness/tests/test_machado2009.py b/colour/blindness/tests/test_machado2009.py
@@ -16,7 +16,7 @@
 from colour.utilities import ignore_numpy_errors
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2013 - 2015 - Colour Developers'
+__copyright__ = 'Copyright (C) 2013-2020 - Colour Developers'
 __license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
 __email__ = 'colour-developers@colour-science.org'
diff --git a/colour/colorimetry/spectrum.py b/colour/colorimetry/spectrum.py
@@ -1907,7 +1907,7 @@ def interpolate(self, shape, interpolator=None, interpolator_args=None):
         Notes
         -----
         -   See :meth:`colour.SpectralDistribution.interpolate` method notes
-        section.
+            section.
 
         Warning
         -------
diff --git a/colour/models/rgb/datasets/display_p3.py b/colour/models/rgb/datasets/display_p3.py
@@ -15,8 +15,9 @@
 
 References
 ----------
--   :cite:`Apple2019` : Apple. (2019). https://developer.apple.com/\
-    documentation/coregraphics/cgcolorspace/1408916-displayp3#discussion
+-   :cite:`AppleInc.2019` : Apple. (2019). Apple Inc. (2019). displayP3.
+    Retrieved December 18, 2019, from https://developer.apple.com/\
+documentation/coregraphics/cgcolorspace/1408916-displayp3
 """
 
 from __future__ import division, unicode_literals
@@ -93,7 +94,7 @@
 
 References
 ----------
-:cite:`Apple2019`
+:cite:`AppleInc.2019`
 
 DISPLAY_P3_COLOURSPACE : RGB_Colourspace
 """
diff --git a/colour/plotting/common.py b/colour/plotting/common.py
@@ -698,7 +698,6 @@ class instances whose type is one of the mapping element types.
 plot_multi_illuminant_sds` definition is as follows:
 
     >>> import colour
-    >>> import colour.plotting
     >>> colour.plotting.plot_multi_illuminant_sds(['A'])
     ... # doctest: +SKIP
 
diff --git a/colour/plotting/tests/test_common.py b/colour/plotting/tests/test_common.py
@@ -358,7 +358,9 @@ def test_filter_cmfs(self):
         """
 
         self.assertListEqual(
-            sorted(filter_cmfs(['.*2 Degree.*']).keys()), [
+            sorted([
+                cmfs.name for cmfs in filter_cmfs(['.*2 Degree.*']).values()
+            ]), [
                 'CIE 1931 2 Degree Standard Observer',
                 'CIE 2012 2 Degree Standard Observer',
                 'Stiles & Burch 1955 2 Degree RGB CMFs',
diff --git a/colour/utilities/__init__.py b/colour/utilities/__init__.py
@@ -6,10 +6,10 @@
 from .common import (
     handle_numpy_errors, ignore_numpy_errors, raise_numpy_errors,
     print_numpy_errors, warn_numpy_errors, ignore_python_warnings, batch,
-    disable_multiprocessing, multiprocessing_pool, is_networkx_installed,
-    is_openimageio_installed, is_pandas_installed, is_iterable, is_string,
-    is_numeric, is_integer, is_sibling, filter_kwargs, filter_mapping,
-    first_item, get_domain_range_scale, set_domain_range_scale,
+    disable_multiprocessing, multiprocessing_pool, is_matplotlib_installed,
+    is_networkx_installed, is_openimageio_installed, is_pandas_installed,
+    is_iterable, is_string, is_numeric, is_integer, is_sibling, filter_kwargs,
+    filter_mapping, first_item, get_domain_range_scale, set_domain_range_scale,
     domain_range_scale, to_domain_1, to_domain_10, to_domain_100,
     to_domain_degrees, to_domain_int, from_range_1, from_range_10,
     from_range_100, from_range_degrees, from_range_int)
@@ -31,9 +31,10 @@
     'handle_numpy_errors', 'ignore_numpy_errors', 'raise_numpy_errors',
     'print_numpy_errors', 'warn_numpy_errors', 'ignore_python_warnings',
     'batch', 'disable_multiprocessing', 'multiprocessing_pool',
-    'is_networkx_installed', 'is_openimageio_installed', 'is_pandas_installed',
-    'is_iterable', 'is_string', 'is_numeric', 'is_integer', 'is_sibling',
-    'filter_kwargs', 'filter_mapping', 'first_item', 'get_domain_range_scale',
+    'is_matplotlib_installed', 'is_networkx_installed',
+    'is_openimageio_installed', 'is_pandas_installed', 'is_iterable',
+    'is_string', 'is_numeric', 'is_integer', 'is_sibling', 'filter_kwargs',
+    'filter_mapping', 'first_item', 'get_domain_range_scale',
     'set_domain_range_scale', 'domain_range_scale', 'to_domain_1',
     'to_domain_10', 'to_domain_100', 'to_domain_degrees', 'to_domain_int',
     'from_range_1', 'from_range_10', 'from_range_100', 'from_range_degrees',
diff --git a/colour/utilities/common.py b/colour/utilities/common.py
@@ -42,9 +42,10 @@
     'handle_numpy_errors', 'ignore_numpy_errors', 'raise_numpy_errors',
     'print_numpy_errors', 'warn_numpy_errors', 'ignore_python_warnings',
     'batch', 'disable_multiprocessing', 'multiprocessing_pool',
-    'is_networkx_installed', 'is_openimageio_installed', 'is_pandas_installed',
-    'is_iterable', 'is_string', 'is_numeric', 'is_integer', 'is_sibling',
-    'filter_kwargs', 'filter_mapping', 'first_item', 'get_domain_range_scale',
+    'is_matplotlib_installed', 'is_networkx_installed',
+    'is_openimageio_installed', 'is_pandas_installed', 'is_iterable',
+    'is_string', 'is_numeric', 'is_integer', 'is_sibling', 'filter_kwargs',
+    'filter_mapping', 'first_item', 'get_domain_range_scale',
     'set_domain_range_scale', 'domain_range_scale', 'to_domain_1',
     'to_domain_10', 'to_domain_100', 'to_domain_degrees', 'to_domain_int',
     'from_range_1', 'from_range_10', 'from_range_100', 'from_range_degrees',
@@ -300,6 +301,37 @@ def terminate(self):
         pool.terminate()
 
 
+def is_matplotlib_installed(raise_exception=False):
+    """
+    Returns if *Matplotlib* is installed and available.
+
+    Parameters
+    ----------
+    raise_exception : bool
+        Raise exception if *Matplotlib* is unavailable.
+
+    Returns
+    -------
+    bool
+        Is *Matplotlib* installed.
+
+    Raises
+    ------
+    ImportError
+        If *Matplotlib* is not installed.
+    """
+
+    try:  # pragma: no cover
+        import matplotlib  # noqa
+
+        return True
+    except ImportError as error:  # pragma: no cover
+        if raise_exception:
+            raise ImportError(('"Matplotlib" related API features '
+                               'are not available: "{0}".').format(error))
+        return False
+
+
 def is_networkx_installed(raise_exception=False):
     """
     Returns if *NetworkX* is installed and available.
diff --git a/colour/utilities/tests/test_data_structures.py b/colour/utilities/tests/test_data_structures.py
@@ -103,15 +103,16 @@ def test_keys_from_value(self):
         """
 
         lookup = Lookup(John='Doe', Jane='Doe', Luke='Skywalker')
-        self.assertListEqual(
-            sorted(['Jane', 'John']), sorted(lookup.keys_from_value('Doe')))
+        self.assertListEqual(['Jane', 'John'],
+                             sorted(lookup.keys_from_value('Doe')))
 
         lookup = Lookup(
             A=np.array([0, 1, 2]),
             B=np.array([0, 1, 2]),
             C=np.array([1, 2, 3]))
-        self.assertListEqual(
-            sorted(['A', 'B']), lookup.keys_from_value(np.array([0, 1, 2])))
+        self.assertListEqual(['A', 'B'],
+                             sorted(
+                                 lookup.keys_from_value(np.array([0, 1, 2]))))
 
     def test_first_key_from_value(self):
         """
diff --git a/docs/basics.rst b/docs/basics.rst
@@ -95,8 +95,6 @@ Which enables image processing:
 
 .. code:: python
 
-    import colour.plotting
-
     RGB = colour.read_image('_static/Logo_Small_001.png')
     RGB = RGB[..., 0:3]  # Discarding alpha channel.
     XYZ = colour.sRGB_to_XYZ(RGB)
diff --git a/docs/colour.algebra.rst b/docs/colour.algebra.rst
@@ -36,6 +36,7 @@ Interpolation
 
 .. autosummary::
     :toctree: generated/
+
     lagrange_coefficients
     TABLE_INTERPOLATION_METHODS
     table_interpolation
diff --git a/docs/colour.utilities.rst b/docs/colour.utilities.rst
@@ -34,6 +34,7 @@ Common
     batch
     disable_multiprocessing
     multiprocessing_pool
+    is_matplotlib_installed
     is_networkx_installed
     is_openimageio_installed
     is_pandas_installed
diff --git a/docs/conf.py b/docs/conf.py
diff --git a/docs/index.rst b/docs/index.rst
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
diff --git a/tasks.py b/tasks.py
