Merge branch 'feature/v0.1.10' into develop

Author: KelSolaar

Dockerfile

@@ -1,15 +1,11 @@
-FROM continuumio/miniconda
+FROM python:3.6
 
-RUN apt-get update
+WORKDIR /tmp
+COPY ./requirements.txt /tmp
+RUN pip install -r requirements.txt \
+    && rm /tmp/requirements.txt
 
-RUN /opt/conda/bin/conda install -y -c conda-forge colour-science
-RUN pip install \
-    dash \
-    dash-core-components \
-    dash-html-components \
-    dash-renderer \
-    gunicorn \
-    plotly
+ARG CACHE_DATE
 
 RUN mkdir -p /home/dash/colour-dash
 WORKDIR /home/dash/colour-dash

README.rst

@@ -36,12 +36,8 @@ Development
 
 .. code-block:: bash
 
-    $ conda create -y -n python-colour-dash
-    $ source activate python-colour-dash
-    $ conda install -y -c conda-forge colour-science
-    $ conda install invoke
-    $ pip install dash dash-core-components dash-html-components dash-renderer plotly
-    $ python index.py
+    $ poetry install
+    $ poetry run invoke docker-run
 
 Code of Conduct
 ---------------

apps/rgb_colourspace_models_chromatically_adapted_primaries.py renamed to apps/rgb_colourspace_chromatically_adapted_primaries.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 """
-RGB Colourspace Models Chromatically Adapted Primaries Application
-==================================================================
+RGB Colourspace Chromatically Adapted Primaries Application
+===========================================================
 """
 
 from __future__ import division, unicode_literals
 
-import numpy as np
-import urlparse
+import sys
+import urllib.parse
 from dash.dependencies import Input, Output
 from dash_core_components import Dropdown, Link, Markdown, Slider
 from dash_html_components import A, Code, Div, H3, H5, Li, Pre, Ul
@@ -30,7 +30,7 @@
     'set_primaries_output'
 ]
 
-APP_NAME = 'RGB Colourspace Models Chromatically Adapted Primaries'
+APP_NAME = 'RGB Colourspace Chromatically Adapted Primaries'
 """
 App name.
 
@@ -46,8 +46,8 @@
 
 APP_DESCRIPTION = ('This app computes the '
                    '*Chromatically Adapted Primaries* of the given '
-                   '*RGB Colourspace Model* to the given *Illuminant*'
-                   ' using the given *Chromatic Adaptation Transform*.')
+                   '*RGB Colourspace* to the given *Illuminant* using the '
+                   'given *Chromatic Adaptation Transform*.')
 """
 App description.
 
@@ -116,7 +116,7 @@
                className='list-inline-item'),
             Li([
                 A('Permalink',
-                  href=urlparse.urljoin(SERVER_URL, APP_PATH),
+                  href=urllib.parse.urljoin(SERVER_URL, APP_PATH),
                   target='_blank')
             ],
                className='list-inline-item'),
@@ -153,7 +153,7 @@ def set_primaries_output(colourspace, illuminant,
                          chromatic_adaptation_transform, formatter, decimals):
     """
     Computes and writes the chromatically adapted *primaries *of the given
-    *RGB* colourspace model to the given *illuminant* using the given
+    *RGB* colourspace to the given *illuminant* using the given
     *chromatic adaptation transform*to into the output :class:`Pre` class
     instance.
 
@@ -185,7 +185,7 @@ def set_primaries_output(colourspace, illuminant,
 
     with colour.utilities.numpy_print_options(
             formatter={'float': ('{{: 0.{0}f}}'.format(decimals)).format},
-            threshold=np.nan):
+            threshold=sys.maxsize):
         if formatter == 'str':
             P = str(P)
         elif formatter == 'repr':

apps/rgb_colourspace_models_transformation_matrix.py renamed to apps/rgb_colourspace_transformation_matrix.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 """
-RGB Colourspace Models Transformation Matrix Application
-========================================================
+RGB Colourspace Transformation Matrix Application
+=================================================
 """
 
 from __future__ import division, unicode_literals
 
-import numpy as np
-import urlparse
+import urllib.parse
+import sys
 from dash.dependencies import Input, Output
 from dash_core_components import Dropdown, Link, Markdown, Slider
 from dash_html_components import A, Code, Div, H3, H5, Li, Pre, Ul
@@ -31,7 +31,7 @@
     'set_RGB_to_RGB_matrix_output'
 ]
 
-APP_NAME = 'RGB Colourspace Models Transformation Matrix'
+APP_NAME = 'RGB Colourspace Transformation Matrix'
 """
 App name.
 
@@ -124,7 +124,7 @@
                className='list-inline-item'),
             Li([
                 A('Permalink',
-                  href=urlparse.urljoin(SERVER_URL, APP_PATH),
+                  href=urllib.parse.urljoin(SERVER_URL, APP_PATH),
                   target='_blank')
             ],
                className='list-inline-item'),
@@ -191,7 +191,7 @@ def set_RGB_to_RGB_matrix_output(input_colourspace, output_colourspace,
 
     with colour.utilities.numpy_print_options(
             formatter={'float': ('{{: 0.{0}f}}'.format(decimals)).format},
-            threshold=np.nan):
+            threshold=sys.maxsize):
         if formatter == 'str':
             M = str(M)
         elif formatter == 'repr':

index.py

@@ -10,9 +10,9 @@
 from dash_core_components import Link, Location, Markdown
 from dash_html_components import A, Div, H3, P
 
-import apps.rgb_colourspace_models_transformation_matrix as app_1
-import apps.rgb_colourspace_models_chromatically_adapted_primaries as app_2
-from app import APP
+import apps.rgb_colourspace_transformation_matrix as app_1
+import apps.rgb_colourspace_chromatically_adapted_primaries as app_2
+from app import APP, SERVER  # noqa
 
 __author__ = 'Colour Developers'
 __copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'

pyproject.toml

@@ -39,6 +39,13 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.5"
+colour-science = "^0.3.14"
+dash = "*"
+dash-core-components = "*"
+dash-html-components = "*"
+dash-renderer = "*"
+gunicorn = "*"
+plotly = "*"
 
 coverage = { version = "*", optional = true }  # Development dependency.
 flake8 = { version = "*", optional = true }  # Development dependency.

requirements.txt

@@ -0,0 +1,50 @@
+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
+future==0.18.2
+gunicorn==19.9.0
+identify==1.4.7
+imageio==2.6.1
+importlib-metadata==0.23
+invoke==1.3.0
+itsdangerous==1.1.0
+Jinja2==2.10.3
+MarkupSafe==1.1.1
+mccabe==0.6.1
+more-itertools==7.2.0
+nodeenv==1.3.3
+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
+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
+yapf==0.23.0
+zipp==0.6.0

tasks.py

@@ -22,7 +22,7 @@
 
 __all__ = [
     'APPLICATION_NAME', 'ORG', 'CONTAINER', 'clean', 'quality', 'formatting',
-    'docker_build', 'docker_remove', 'docker_run'
+    'requirements', 'docker_build', 'docker_remove', 'docker_run'
 ]
 
 APPLICATION_NAME = app.__application_name__
@@ -106,6 +106,27 @@ def formatting(ctx, yapf=False):
 
 
 @task
+def requirements(ctx):
+    """
+    Export the *requirements.txt* file.
+
+    Parameters
+    ----------
+    ctx : invoke.context.Context
+        Context.
+
+    Returns
+    -------
+    bool
+        Task success.
+    """
+
+    message_box('Exporting "requirements.txt" file...')
+    ctx.run('poetry run pip freeze | grep -v '
+            '"github.com/colour-science/colour-dash" > requirements.txt')
+
+
+@task(requirements)
 def docker_build(ctx):
     """
     Builds the *docker* image.