Merge branch 'release/v0.1.6'

Author: KelSolaar

.gitignore

@@ -4,4 +4,6 @@
 .idea
 .vscode
 __pycache__
-node_modules
+colour_analysis.egg-info
+node_modules
+poetry.lock

.pre-commit-config.yaml

@@ -0,0 +1,9 @@
+repos:
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.8
+    hooks:
+    -   id: flake8
+-   repo: https://github.com/pre-commit/mirrors-yapf
+    rev: v0.23.0
+    hooks:
+    -   id: yapf

CODE_OF_CONDUCT.md

@@ -0,0 +1,51 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others’ private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when an individual is representing the project or its community in public spaces. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## 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.
+
+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.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html][homepage].
+
+For answers to common questions about this code of conduct, see [https://www.contributor-covenant.org/faq][faq].
+
+
+[homepage]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+[faq]: https://www.contributor-covenant.org/faq

CONTRIBUTORS.rst

@@ -12,6 +12,6 @@ About
 -----
 
 | **Colour - Analysis** by Colour Developers
-| Copyright © 2018 – 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-analysis-three.js <http://github.com/colour-science/colour-analysis-three.js>`_
+| Copyright © 2018-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-analysis-three.js <https://github.com/colour-science/colour-analysis-three.js>`__

Dockerfile

@@ -1,48 +1,11 @@
-FROM continuumio/miniconda
+FROM python:3.6
 
-RUN apt-get update && \
-    apt install -y \
-        build-essential \
-        cmake \
-        libboost-all-dev \
-        libbz2-dev \
-        libgif-dev \
-        libgl1-mesa-glx \
-        libfreetype6-dev \
-        libilmbase-dev \
-        libjpeg-dev \
-        libopenexr-dev \
-        libpng-dev \
-        libraw-dev \
-        libtiff5-dev \
-        libwebp-dev \
-        qtbase5-dev && \
-    apt-get clean
-
-RUN cd /tmp && \
-    wget https://github.com/OpenImageIO/oiio/archive/Release-1.8.13.tar.gz -O OpenImageIO-1.8.13.tar.gz && \
-    tar -xvf OpenImageIO-1.8.13.tar.gz && \
-    cd oiio-Release-1.8.13 && \
-    make && \
-    cp -r /tmp/oiio-Release-1.8.13/dist/linux64/bin/* /usr/local/bin/ && \
-    cp -r /tmp/oiio-Release-1.8.13/dist/linux64/lib/* /usr/local/lib/ && \
-    cp /tmp/oiio-Release-1.8.13/dist/linux64/lib/python2.7/site-packages/OpenImageIO.so /opt/conda/lib/python2.7/site-packages/
-
-RUN /opt/conda/bin/conda install -y \
-    flask \
-    numpy \
-    matplotlib \
-    scipy \
-    six
+WORKDIR /tmp
+COPY ./requirements.txt /tmp
+RUN pip install -r requirements.txt
 
 ARG CACHE_DATE
 
-RUN pip install \
-    gunicorn \
-    Flask-Caching \
-    git+git://github.com/colour-science/colour@develop \
-    git+git://github.com/colour-science/flask-compress@feature/cache
-
 RUN mkdir -p /home/colour-analysis
 WORKDIR /home/colour-analysis
 COPY . /home/colour-analysis

README.rst

@@ -6,8 +6,8 @@ Colour - Analysis
 Introduction
 ------------
 
-Image analysis tools based on `Colour <https://github.com/colour-science/colour>`_
-and `Three.js <https://github.com/mrdoob/three.js/>`_.
+Image analysis tools based on `Colour <https://github.com/colour-science/colour>`__
+and `Three.js <https://github.com/mrdoob/three.js/>`__.
 
 Installation
 ------------
@@ -37,18 +37,19 @@ Development
 
 .. code-block:: bash
 
-    $ conda create -y -n python-colour-analysis
-    $ source activate python-colour-analysis
-    $ conda install -y -c conda-forge colour-science
-    $ conda install flask invoke matplotlib
-    $ pip install git+git://github.com/colour-science/flask-compress@feature/cache
-    $ npm run build
-    $ python app.py
+    $ poetry install
+    $ poetry run invoke docker-run
+
+Code of Conduct
+---------------
+
+The *Code of Conduct*, adapted from the `Contributor Covenant 1.4 <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>`__,
+is available on the `Code of Conduct <https://www.colour-science.org/code-of-conduct/>`__ page.
 
 About
 -----
 
 | **Colour - Analysis** by Colour Developers
-| Copyright © 2018 – 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-analysis-three.js <http://github.com/colour-science/colour-analysis-three.js>`_
+| Copyright © 2018-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-analysis-three.js <https://github.com/colour-science/colour-analysis-three.js>`__

app.py

@@ -19,12 +19,12 @@
     COLOURSPACE_MODEL, IMAGE_COLOURSPACE, IMAGE_DECODING_CCTF,
     PRIMARY_COLOURSPACE, RGB_colourspaces, RGB_colourspace_volume_visual,
     RGB_image_scatter_visual, SECONDARY_COLOURSPACE, colourspace_models,
-    decoding_cctfs, image_data, pointer_gamut_visual, spectral_locus_visual,
+    cctf_decodings, image_data, pointer_gamut_visual, spectral_locus_visual,
     visible_spectrum_visual)
 
 __author__ = 'Colour Developers'
-__copyright__ = 'Copyright (C) 2018 - Colour Developers'
-__license__ = 'New BSD License - http://opensource.org/licenses/BSD-3-Clause'
+__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
+__license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
 __maintainer__ = 'Colour Developers'
 __email__ = 'colour-science@googlegroups.com'
 __status__ = 'Production'
@@ -33,7 +33,7 @@
 
 __major_version__ = '0'
 __minor_version__ = '1'
-__change_version__ = '5'
+__change_version__ = '6'
 __version__ = '.'.join(
     (__major_version__,
      __minor_version__,
@@ -42,7 +42,7 @@
 
 __all__ = [
     'APP', 'CACHE', 'CACHE_DEFAULT_TIMEOUT', 'IMAGES_DIRECTORY',
-    'images_response', 'decoding_cctfs_response',
+    'images_response', 'cctf_decodings_response',
     'colourspace_models_response', 'RGB_colourspaces_response',
     'image_data_response', 'RGB_colourspace_volume_visual_response',
     'RGB_image_scatter_visual_response', 'spectral_locus_visual_response',
@@ -75,7 +75,7 @@
 APP.config.update(
     COMPRESS_LEVEL=3,
     COMPRESS_CACHE_KEY=lambda x: x.full_path,
-    COMPRESS_CACHE_BACKEND=lambda: SimpleCache(default_timeout=
+    COMPRESS_CACHE_BACKEND=lambda: SimpleCache(default_timeout=  # noqa
                                                CACHE_DEFAULT_TIMEOUT),
 )
 
@@ -157,7 +157,7 @@ def images_response():
 
 @APP.route('/decoding-cctfs')
 @CACHE.cached(timeout=CACHE_DEFAULT_TIMEOUT, query_string=True)
-def decoding_cctfs_response():
+def cctf_decodings_response():
     """
     Returns the decoding colour component transfer functions response.
 
@@ -167,7 +167,7 @@ def decoding_cctfs_response():
         Decoding colour component transfer functions response.
     """
 
-    json_data = decoding_cctfs()
+    json_data = cctf_decodings()
 
     response = Response(json_data, status=200, mimetype='application/json')
     response.headers['X-Content-Length'] = len(json_data)