Merge branch 'release/v0.3.8'

.travis.yml

@@ -7,27 +7,18 @@ matrix:
   - python: 3.5
     env:
     - PYTHON_VERSION="3.5"
-    - NUMPY_VERSION="1.10.1"
-    - SCIPY_VERSION="0.16.0"
-    - MATPLOTLIB_VERSION="1.4.3"
   - python: 3.4
     env:
     - PYTHON_VERSION="3.4"
-    - NUMPY_VERSION="1.10.1"
-    - SCIPY_VERSION="0.16.0"
-    - MATPLOTLIB_VERSION="1.4.3"
   - python: 2.7
     env:
     - PYTHON_VERSION="2.7"
-    - NUMPY_VERSION="1.10.1"
-    - SCIPY_VERSION="0.16.0"
-    - MATPLOTLIB_VERSION="1.4.3"
 
 notifications:
   slack: colour-science:Y6lPPcN7y53Js94geqUpqsAP
 
 before_install:
-  - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+  - if [ ${TRAVIS_PYTHON_VERSION:O:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda2-3.19.0-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.19.0-Linux-x86_64.sh -O miniconda.sh; fi
   - chmod +x miniconda.sh
   - ./miniconda.sh -b -p /home/travis/miniconda
   - export PATH=/home/travis/miniconda/bin:$PATH
@@ -44,8 +35,11 @@ install:
   - source activate colour-test
   - pip install coverage coveralls flake8 mock==1.0.1
 
+before_script:
+  - export PYTHONWARNINGS=ignore
+
 script:
-  - flake8 colour
+  - flake8 colour --exclude=examples
   - nosetests --nocapture --with-doctest --doctest-options=+ELLIPSIS,+NORMALIZE_WHITESPACE --with-coverage --cover-package=colour -exclude-dir=
 
 after_success:

CHANGES.rst

@@ -9,7 +9,7 @@ The releases changes are available on Github: https://github.com/colour-science/
 About
 -----
 
-| **Colour** by Colour Developers - 2013 - 2015
-| Copyright © 2013 - 2015 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
+| **Colour** by Colour Developers - 2013-2016
+| Copyright © 2013-2016 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
 | This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
 | `http://github.com/colour-science/colour <http://github.com/colour-science/colour>`_

CONTRIBUTING.rst

@@ -4,12 +4,12 @@ Contributing
 Contributing to Colour
 ----------------------
 
-If you would like to contribute to **Colour**, please refer to the following guide: http://colour-science.org/contributing.php
+If you would like to contribute to **Colour**, please refer to the following guide: http://colour-science.org/contributing/
 
 About
 -----
 
-| **Colour** by Colour Developers - 2013 - 2015
-| Copyright © 2013 - 2015 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
+| **Colour** by Colour Developers - 2013-2016
+| Copyright © 2013-2016 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
 | This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
 | `http://github.com/colour-science/colour <http://github.com/colour-science/colour>`_

CONTRIBUTORS.rst

@@ -52,10 +52,22 @@ Special Mentions
 
 -   **Aurélia Sellier**, *Line Producer @ Cube Creative*
 
+Others
+------
+
+-   Nick Spiker
+-   fangjy88
+-   henczati
+-   Nick-Shaw
+-   Ron024
+-   scooperly
+-   sobotka
+-   zachlewis
+
 About
 -----
 
-| **Colour** by Colour Developers - 2013 - 2015
-| Copyright © 2013 - 2015 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
+| **Colour** by Colour Developers - 2013-2016
+| Copyright © 2013-2016 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
 | This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
 | `http://github.com/colour-science/colour <http://github.com/colour-science/colour>`_

COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2013 - 2015, Colour Developers
+Copyright (c) 2013-2016, Colour Developers
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -21,4 +21,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 - 2015, Colour Developers
+Copyright (c) 2013-2016, Colour Developers
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -21,4 +21,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

MANIFEST.in

@@ -1,6 +1,8 @@
 include COPYING
 include LICENSE
+include *.bib
 include *.rst
+graft colour/appearance/tests/fixtures
 graft colour/examples
 graft colour/io
 graft colour/plotting

README.rst

@@ -1,53 +1,91 @@
-.. image:: https://badge.waffle.io/colour-science/colour.svg?label=ready&title=Ready
+Colour Science for Python
+=========================
+
+..  image:: https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_Medium_001.png
+
+.. start-badges
+
+.. list-table::
+    :stub-columns: 1
+
+    * - Social
+      - |gitter|
+    * - Status
+      - |waffle| |travis| |coveralls| |scrutinizer| |landscape| |gemnasium|
+    * - Package
+      - |version| |downloads|
+    * - Citation
+      - |zenodo|
+
+.. |gitter| image:: https://img.shields.io/gitter/room/colour-science/colour.svg
+    :target: https://gitter.im/colour-science/colour/
+    :alt: Gitter
+.. |waffle| image:: https://badge.waffle.io/colour-science/colour.svg?label=ready&title=Ready
     :target: https://github.com/colour-science/colour/issues
-.. image:: https://img.shields.io/travis/colour-science/colour/develop.svg
+    :alt: Issues Ready
+.. |travis| image:: https://img.shields.io/travis/colour-science/colour/develop.svg
     :target: https://travis-ci.org/colour-science/colour
-.. image:: http://img.shields.io/coveralls/colour-science/colour/develop.svg
+    :alt: Develop Build Status
+.. |coveralls| image:: http://img.shields.io/coveralls/colour-science/colour/develop.svg
     :target: https://coveralls.io/r/colour-science/colour
-.. image:: https://img.shields.io/scrutinizer/g/colour-science/colour/develop.svg
+    :alt: Coverage Status
+.. |scrutinizer| image:: https://img.shields.io/scrutinizer/g/colour-science/colour/develop.svg
     :target: https://scrutinizer-ci.com/g/colour-science/colour/
-.. image:: https://landscape.io/github/colour-science/colour/master/landscape.png
+    :alt: Code Quality
+.. |landscape| image:: https://landscape.io/github/colour-science/colour/master/landscape.png
     :target: https://landscape.io/github/colour-science/colour
-.. image:: https://img.shields.io/gemnasium/colour-science/colour.svg
+    :alt: Code Quality
+.. |gemnasium| image:: https://img.shields.io/gemnasium/colour-science/colour.svg
     :target: https://gemnasium.com/colour-science/colour
-.. image:: https://badge.fury.io/py/colour-science.svg
+    :alt: Dependencies Status
+.. |version| image:: https://badge.fury.io/py/colour-science.svg
     :target: https://pypi.python.org/pypi/colour-science
-.. image:: https://img.shields.io/pypi/dm/colour-science.svg
+    :alt: Package Version
+.. |downloads| image:: https://img.shields.io/pypi/dm/colour-science.svg
     :target: https://pypi.python.org/pypi/colour-science
-.. image:: https://zenodo.org/badge/doi/10.5281/zenodo.35309.png
-    :target: http://dx.doi.org/10.5281/zenodo.35309
-
-Colour Science for Python
-=========================
+    :alt: Package Downloads
+.. |zenodo| image:: https://zenodo.org/badge/doi/10.5281/zenodo.57294.png
+    :target: http://dx.doi.org/10.5281/zenodo.57294
+    :alt: DOI
 
-..  image:: https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_Medium_001.png
+.. end-badges
 
-`Colour <https://github.com/colour-science/colour>`_ is a `Python <https://www.python.org/>`_ colour science package implementing a comprehensive number of colour theory transformations and algorithms.
+`Colour <https://github.com/colour-science/colour>`_ is a
+`Python <https://www.python.org/>`_ colour science package implementing a
+comprehensive number of colour theory transformations and algorithms.
 
-It is open source and freely available under the `New BSD License <http://opensource.org/licenses/BSD-3-Clause>`_ terms.
+It is open source and freely available under the
+`New BSD License <http://opensource.org/licenses/BSD-3-Clause>`_ terms.
 
 Features
 --------
 
-`Colour <https://github.com/colour-science/colour>`_ features a rich dataset and collection of objects, please see the `features <http://colour-science.org/features/>`_ page for more information.
+`Colour <https://github.com/colour-science/colour>`_ features a rich dataset
+and collection of objects, please see the
+`features <http://colour-science.org/features/>`_ page for more information.
 
 Installation
 ------------
 
-The installation procedure is described in the `Installation Guide <http://colour-science.org/installation-guide/>`_.
+The installation procedure is described in the
+`Installation Guide <http://colour-science.org/installation-guide/>`_.
 
 Usage
 -----
 
-The two main references for `Colour <https://github.com/colour-science/colour>`_ usage are the complete sphinx `API Reference <http://colour.readthedocs.org/en/latest/>`_ and the `IPython Notebooks <http://nbviewer.ipython.org/github/colour-science/colour-ipython/blob/master/notebooks/colour.ipynb>`_ with detailed historical and theoretical context and images:
+The two main references for `Colour <https://github.com/colour-science/colour>`_
+usage are the complete Sphinx `API Reference <http://colour.readthedocs.io/en/latest/>`_
+and the `Jupyter Notebooks <http://nbviewer.jupyter.org/github/colour-science/colour-notebooks/blob/master/notebooks/colour.ipynb>`_
+with detailed historical and theoretical context and images:
 
--   `API Reference <http://colour.readthedocs.org/en/latest/>`_
--   `IPython Notebooks <http://nbviewer.ipython.org/github/colour-science/colour-ipython/blob/master/notebooks/colour.ipynb>`_
+-   `API Reference <http://colour.readthedocs.io/en/latest/>`_
+-   `Jupyter Notebooks <http://nbviewer.jupyter.org/github/colour-science/colour-notebooks/blob/master/notebooks/colour.ipynb>`_
 
 Contributing
 ------------
 
-If you would like to contribute to `Colour <https://github.com/colour-science/colour>`_, please refer to the following `Contributing <http://colour-science.org/contributing/>`_ guide.
+If you would like to contribute to `Colour <https://github.com/colour-science/colour>`_,
+please refer to the following `Contributing <http://colour-science.org/contributing/>`_ guide.
 
 Changes
 -------
@@ -59,12 +97,14 @@ Bibliography
 
 The bibliography is available on the `Bibliography <http://colour-science.org/bibliography/>`_ page.
 
-It is also viewable directly from the repository in either `BibTeX <https://github.com/colour-science/colour/blob/develop/BIBLIOGRAPHY.bib>`_ format or `reStructuredText <https://github.com/colour-science/colour/blob/develop/BIBLIOGRAPHY.rst>`_.
+It is also viewable directly from the repository in either
+`BibTeX <https://github.com/colour-science/colour/blob/develop/BIBLIOGRAPHY.bib>`_
+format or `reStructuredText <https://github.com/colour-science/colour/blob/develop/BIBLIOGRAPHY.rst>`_.
 
 About
 -----
 
-| **Colour** by Colour Developers - 2013 - 2015
-| Copyright © 2013 - 2015 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
+| **Colour** by Colour Developers - 2013-2016
+| Copyright © 2013-2016 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
 | This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
 | `http://github.com/colour-science/colour <http://github.com/colour-science/colour>`_

TODO.rst

@@ -15,35 +15,39 @@ TODO
 
         - hunt.py
 
-            - (414, 7) # TODO: Implement hue quadrature & composition computation.
-            - (445, 7) # TODO: Implement whiteness-blackness :math:`Q_{wb}` computation.
+            - (418, 7) # TODO: Implement hue quadrature & composition computation.
+            - (449, 7) # TODO: Implement whiteness-blackness :math:`Q_{wb}` computation.
 
         - llab.py
 
-            - (305, 7) # TODO: Implement hue composition computation.
+            - (309, 7) # TODO: Implement hue composition computation.
 
         - nayatani95.py
 
-            - (267, 7) # TODO: Implement hue quadrature & composition computation.
-            - (285, 7) # TODO: Investigate components usage.
+            - (271, 7) # TODO: Implement hue quadrature & composition computation.
+            - (289, 7) # TODO: Investigate components usage.
 
         - rlab.py
 
-            - (242, 7) # TODO: Implement hue composition computation.
+            - (246, 7) # TODO: Implement hue composition computation.
 
     - colorimetry (1 item in 1 file)
 
         - spectrum.py
 
-            - (1722, 11) # TODO: Provide support for fractional steps like 0.1, etc...
+            - (1942, 11) # TODO: Provide support for fractional interval like 0.1, etc...
+
+        - tristimulus.py
+
+            - (678, 11) # TODO: Investigate code vectorisation.
 
     - models (2 item in 2 file)
 
         - tests (1 item in 1 file)
 
             - tests_derivation.py
 
-                - (302, 15) # TODO: Simplify that monster.
+                - (301, 15) # TODO: Simplify that monster.
 
         - derivation.py
 
@@ -61,19 +65,19 @@ TODO
 
         - munsell.py
 
-            - (841, 11) # TODO: Consider refactoring implementation.
-            - (1181, 11) # TODO: Should raise KeyError, need to check the tests.
+            - (840, 11) # TODO: Consider refactoring implementation.
+            - (1179, 11) # TODO: Should raise KeyError, need to check the tests.
 
     - volume (1 item in 1 file)
 
         -  rgb.py
 
-            - (326, 11) # TODO: Investigate for generator yielding directly a ndarray.
+            - (320, 7) # TODO: Investigate for generator yielding directly a ndarray.
 
 About
 -----
 
-| **Colour** by Colour Developers - 2013 - 2015
-| Copyright © 2013 - 2015 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
+| **Colour** by Colour Developers - 2013-2016
+| Copyright © 2013-2016 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
 | This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
 | `http://github.com/colour-science/colour <http://github.com/colour-science/colour>`_