Skip to content

Commit

Permalink
Merge branch 'feature/v0.3.14' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed Oct 26, 2019
2 parents ddd1dc0 + af3a0c1 commit 9eea6e1
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 30 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.2647615-blue.svg?style=flat-square
:target: https://dx.doi.org/10.5281/zenodo.2647615
.. |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
:alt: DOI

.. end-badges
Expand Down
95 changes: 75 additions & 20 deletions TODO.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ TODO

- colour/__init__.py

- Line 296 : # TODO: Remove legacy printing support when deemed appropriate.
- Line 306 : # TODO: Remove legacy printing support when deemed appropriate.


- colour/colorimetry/spectrum.py
Expand All @@ -16,23 +16,23 @@ TODO

- colour/colorimetry/tristimulus.py

- Line 765 : # TODO: Investigate code vectorisation.
- Line 769 : # TODO: Investigate code vectorisation.


- colour/colorimetry/tests/test_spectrum.py

- Line 1440 : # 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 1640 : # 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 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.


- colour/appearance/ciecam02.py

- Line 288 : # TODO: Compute hue composition.
- Line 298 : # TODO: Compute hue composition.


- colour/appearance/cam16.py

- Line 282 : # TODO: Compute hue composition.
- Line 292 : # TODO: Compute hue composition.


- colour/appearance/hunt.py
Expand Down Expand Up @@ -62,9 +62,20 @@ TODO
- Line 37 : # TODO: The current fixture data is generated from direct computations using our model implementation. We have asked ground truth data to Li et al. (2016) and will update the "cam16.csv" file accordingly whenever we receive it.


- colour/io/tests/test_image.py

- Line 210 : # TODO: Investigate "OIIO" behaviour here: 1.0 != 15360.0 image = read_image_OpenImageIO( os.path.join(RESOURCES_DIRECTORY, 'Colour_Logo.png'), 'float16') self.assertIs(image.dtype, np.dtype('float16')) self.assertEqual(np.min(image), 0.0) self.assertEqual(np.max(image), 1.0)


- 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.


- colour/graph/conversion.py

- Line 927 : # TODO: Remove the following warning whenever the automatic colour conversion graph implementation is considered stable.


- colour/models/rgb/derivation.py
Expand All @@ -74,18 +85,49 @@ TODO

- colour/models/rgb/rgb_colourspace.py

- Line 540 : # TODO: Revisit for potential behaviour / type checking.
- Line 573 : # TODO: Revisit for potential behaviour / type checking.
- Line 541 : # TODO: Revisit for potential behaviour / type checking.
- Line 574 : # TODO: Revisit for potential behaviour / type checking.


- colour/models/rgb/tests/test_derivation.py

- Line 279 : # TODO: Simplify that monster.


- 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.


- colour/utilities/verbose.py

- Line 572 : # TODO: Implement support for "pyproject.toml" file whenever "TOML" is supported in the standard library.


- colour/utilities/common.py

- Line 569 : # TODO: Remove when dropping Python 2.7.


- colour/utilities/array.py

- Line 183 : # TODO: Change to "DEFAULT_INT_DTYPE" when and if https://github.com/numpy/numpy/issues/11956 is addressed.
- Line 186 : # TODO: Change to "DEFAULT_INT_DTYPE" when and if https://github.com/numpy/numpy/issues/11956 is addressed.


- colour/utilities/tests/test_deprecation.py

- Line 317 : # TODO: Use "assertWarns" when dropping Python 2.7.


- colour/plotting/models.py

- Line 1569 : # TODO: Filter appropriate colour models.


- colour/plotting/common.py

- Line 821 : # TODO: Consider using "MutableMapping" here.


- colour/characterisation/correction.py
Expand All @@ -95,35 +137,48 @@ TODO

- colour/notation/munsell.py

- Line 1062 : # TODO: Consider refactoring implementation.
- Line 1067 : # TODO: Consider refactoring implementation.


- colour/continuous/signal.py

- Line 380 : # TODO: Check for interpolator capabilities.
- Line 445 : # TODO: Check for extrapolator capabilities.
- Line 586 : # TODO: Discuss what is the most suitable behaviour, either the following or __str__ one.
- Line 384 : # TODO: Check for interpolator capabilities.
- Line 449 : # TODO: Check for extrapolator capabilities.


- colour/continuous/multi_signals.py

- colour/continuous/multi_signal.py
- Line 1322 : # TODO: Implement support for Signal class passing.

- Line 698 : # TODO: Discuss what is the most suitable behaviour, either the following or __str__ one.
- Line 1319 : # TODO: Implement support for Signal class passing.

- colour/continuous/tests/test_multi_signal.py

- Line 112 : # TODO: Use "assertWarns" when dropping Python 2.7.


- colour/continuous/tests/test_signal.py

- Line 101 : # TODO: Use "assertWarns" when dropping Python 2.7.


- colour/volume/rgb.py

- Line 305 : # TODO: Investigate for generator yielding directly a ndarray.
- Line 306 : # TODO: Investigate for generator yielding directly a ndarray.


- colour/algebra/tests/test_interpolation.py

- Line 437 : # TODO: Revisit if the interpolator can be applied on non-uniform "x" independent variable.
- Line 532 : # TODO: Revisit if the interpolator can be applied on non-uniform "x" independent variable.


- colour/algebra/tests/test_random.py

- Line 61 : # TODO: Use "assertWarns" when dropping Python 2.7.

About
-----

| **Colour** by Colour Developers
| Copyright © 2013-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
| Copyright © 2013-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
| 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>`_
2 changes: 1 addition & 1 deletion colour/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@

__major_version__ = '0'
__minor_version__ = '3'
__change_version__ = '13'
__change_version__ = '14'
__version__ = '.'.join(
(__major_version__,
__minor_version__,
Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/aces.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def log_decoding_ACESproxy(ACESproxy,
| ``lin_AP1`` | [0, 1] | [0, 1] |
+----------------+-----------------------+---------------+
\\* This definition has an input integer switch, thus the domain-range
\\* This definition has an input integer switch, thus the domain-range
scale information is only given for the floating point mode.
References
Expand Down
2 changes: 1 addition & 1 deletion colour/models/rgb/transfer_functions/dcdm.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def eotf_DCDM(XYZ_p, in_int=False):
| ``XYZ`` | [0, 1] | [0, 1] |
+----------------+-----------------------+---------------+
\\* This definition has an input integer switch, thus the domain-range
\\* This definition has an input integer switch, thus the domain-range
scale information is only given for the floating point mode.
References
Expand Down
6 changes: 3 additions & 3 deletions colour/models/rgb/transfer_functions/rimm_romm_rgb.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def cctf_decoding_ROMMRGB(X_p, bit_depth=8, in_int=False):
| ``X`` | [0, 1] | [0, 1] |
+----------------+-----------------------+---------------+
\\* This definition has an input integer switch, thus the domain-range
\\* This definition has an input integer switch, thus the domain-range
scale information is only given for the floating point mode.
References
Expand Down Expand Up @@ -302,7 +302,7 @@ def cctf_decoding_RIMMRGB(X_p, bit_depth=8, in_int=False, E_clip=2.0):
| ``X`` | [0, 1] | [0, 1] |
+----------------+-----------------------+---------------+
\\* This definition has an input integer switch, thus the domain-range
\\* This definition has an input integer switch, thus the domain-range
scale information is only given for the floating point mode.
References
Expand Down Expand Up @@ -466,7 +466,7 @@ def log_decoding_ERIMMRGB(X_p,
| ``X`` | [0, 1] | [0, 1] |
+----------------+-----------------------+---------------+
\\* This definition has an input integer switch, thus the domain-range
\\* This definition has an input integer switch, thus the domain-range
scale information is only given for the floating point mode.
References
Expand Down
5 changes: 5 additions & 0 deletions colour/plotting/tests/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,11 @@ def test_plot_image(self):
path = os.path.join(colour.__path__[0], '..', 'docs', '_static',
'Logo_Medium_001.png')

# Distribution does not ship the documentation thus we are skipping
# this unit test if the image does not exist.
if not os.path.exists(path): # noqa
return

figure, axes = plot_image(read_image(path))

self.assertIsInstance(figure, Figure)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "colour"
version = "0.3.13"
version = "0.3.14"
description = "Colour Science for Python"
license = "BSD-3-Clause"
authors = [ "Colour Developers" ]
Expand Down
2 changes: 1 addition & 1 deletion tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ def virtualise(ctx, tests=True):
ctx.run('python -c "import imageio;'
'imageio.plugins.freeimage.download()"')
if tests:
ctx.run('poetry run nosetests')
ctx.run('poetry run nosetests', env={'MPLBACKEND': 'AGG'})


@task
Expand Down

0 comments on commit 9eea6e1

Please sign in to comment.