Skip to content
This repository was archived by the owner on Nov 24, 2024. It is now read-only.

Commit 4650fc2

Browse files
KelSolaarKelSolaar
committed
Merge branch 'feature/v0.1.6' into develop
2 parents 5ad0ab2 + 226bdc1 commit 4650fc2

30 files changed

+293
-36
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
.idea
55
.vscode
66
__pycache__
7-
node_modules
7+
node_modules
8+
poetry.lock

‎.pre-commit-config.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
repos:
2+
- repo: https://gitlab.com/pycqa/flake8
3+
rev: 3.7.8
4+
hooks:
5+
- id: flake8
6+
- repo: https://github.com/pre-commit/mirrors-yapf
7+
rev: v0.23.0
8+
hooks:
9+
- id: yapf

‎CODE_OF_CONDUCT.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Code of Conduct
2+
3+
## Our Pledge
4+
5+
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.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others’ private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
28+
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.
29+
30+
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.
31+
32+
## Scope
33+
34+
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.
35+
36+
## Enforcement
37+
38+
39+
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.
40+
41+
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.
42+
43+
## Attribution
44+
45+
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].
46+
47+
For answers to common questions about this code of conduct, see [https://www.contributor-covenant.org/faq][faq].
48+
49+
50+
[homepage]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
51+
[faq]: https://www.contributor-covenant.org/faq

‎CONTRIBUTORS.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ About
1212
-----
1313

1414
| **Colour - Analysis** by Colour Developers
15-
| Copyright © 2018 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
16-
| This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
17-
| `http://github.com/colour-science/colour-analysis-three.js <http://github.com/colour-science/colour-analysis-three.js>`_
15+
| Copyright © 2018-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
16+
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
17+
| `https://github.com/colour-science/colour-analysis-three.js <https://github.com/colour-science/colour-analysis-three.js>`__

‎README.rst

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Colour - Analysis
66
Introduction
77
------------
88

9-
Image analysis tools based on `Colour <https://github.com/colour-science/colour>`_
10-
and `Three.js <https://github.com/mrdoob/three.js/>`_.
9+
Image analysis tools based on `Colour <https://github.com/colour-science/colour>`__
10+
and `Three.js <https://github.com/mrdoob/three.js/>`__.
1111

1212
Installation
1313
------------
@@ -45,10 +45,16 @@ Development
4545
$ npm run build
4646
$ python app.py
4747
48+
Code of Conduct
49+
---------------
50+
51+
The *Code of Conduct*, adapted from the `Contributor Covenant 1.4 <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>`__,
52+
is available on the `Code of Conduct <https://www.colour-science.org/code-of-conduct/>`__ page.
53+
4854
About
4955
-----
5056

5157
| **Colour - Analysis** by Colour Developers
52-
| Copyright © 2018 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
53-
| This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
54-
| `http://github.com/colour-science/colour-analysis-three.js <http://github.com/colour-science/colour-analysis-three.js>`_
58+
| Copyright © 2018-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
59+
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
60+
| `https://github.com/colour-science/colour-analysis-three.js <https://github.com/colour-science/colour-analysis-three.js>`__

‎app.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
visible_spectrum_visual)
2424

2525
__author__ = 'Colour Developers'
26-
__copyright__ = 'Copyright (C) 2018 - Colour Developers'
27-
__license__ = 'New BSD License - http://opensource.org/licenses/BSD-3-Clause'
26+
__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
27+
__license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
2828
__maintainer__ = 'Colour Developers'
2929
__email__ = 'colour-science@googlegroups.com'
3030
__status__ = 'Production'
@@ -33,7 +33,7 @@
3333

3434
__major_version__ = '0'
3535
__minor_version__ = '1'
36-
__change_version__ = '5'
36+
__change_version__ = '6'
3737
__version__ = '.'.join(
3838
(__major_version__,
3939
__minor_version__,
@@ -75,7 +75,7 @@
7575
APP.config.update(
7676
COMPRESS_LEVEL=3,
7777
COMPRESS_CACHE_KEY=lambda x: x.full_path,
78-
COMPRESS_CACHE_BACKEND=lambda: SimpleCache(default_timeout=
78+
COMPRESS_CACHE_BACKEND=lambda: SimpleCache(default_timeout= # noqa
7979
CACHE_DEFAULT_TIMEOUT),
8080
)
8181

‎colour_analysis.egg-info/PKG-INFO

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
Metadata-Version: 2.1
2+
Name: colour-analysis
3+
Version: 0.1.6
4+
Summary: Image analysis tools based on Colour and Three.js
5+
Home-page: https://www.colour-science.org/
6+
Author: Colour Developers
7+
License: UNKNOWN
8+
Description: Colour - Analysis
9+
=================
10+
11+
.. image:: https://www.colour-science.org/images/Colour_-_Analysis_-_Three.js.png
12+
13+
Introduction
14+
------------
15+
16+
Image analysis tools based on `Colour <https://github.com/colour-science/colour>`_
17+
and `Three.js <https://github.com/mrdoob/three.js/>`_.
18+
19+
Installation
20+
------------
21+
22+
Pull
23+
~~~~
24+
25+
.. code-block:: bash
26+
27+
$ docker pull colourscience/colour-analysis
28+
29+
Run
30+
~~~
31+
32+
.. code-block:: bash
33+
34+
$ docker run -d \
35+
--name=colour-analysis \
36+
-e COLOUR_ANALYSIS_JS=https://gitcdn.link/repo/colour-science/colour-analysis-three.js/master/dist/colour-analysis.js \
37+
-e COLOUR_ANALYSIS_POSITION_DTYPE=Float16 \
38+
-e COLOUR_ANALYSIS_COLOUR_DTYPE=Float16 \
39+
-v $IMAGES_DIRECTORY:/home/colour-analysis/static/images \
40+
-p 8020:5000 colourscience/colour-analysis
41+
42+
Development
43+
-----------
44+
45+
.. code-block:: bash
46+
47+
$ conda create -y -n python-colour-analysis
48+
$ source activate python-colour-analysis
49+
$ conda install -y -c conda-forge colour-science
50+
$ conda install flask invoke matplotlib
51+
$ pip install git+git://github.com/colour-science/flask-compress@feature/cache
52+
$ npm run build
53+
$ python app.py
54+
55+
Code of Conduct
56+
---------------
57+
58+
The *Code of Conduct*, adapted from the `Contributor Covenant 1.4 <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>`_,
59+
is available on the `Code of Conduct <https://www.colour-science.org/code-of-conduct/>`_ page.
60+
61+
About
62+
-----
63+
64+
| **Colour - Analysis** by Colour Developers
65+
| Copyright © 2018-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
66+
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
67+
| `https://github.com/colour-science/colour-analysis-three.js <https://github.com/colour-science/colour-analysis-three.js>`_
68+
69+
Platform: UNKNOWN
70+
Requires-Python: >=3.5,<4.0
71+
Provides-Extra: development

‎colour_analysis.egg-info/SOURCES.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
README.rst
2+
colour_analysis.py
3+
setup.py
4+
colour_analysis.egg-info/PKG-INFO
5+
colour_analysis.egg-info/SOURCES.txt
6+
colour_analysis.egg-info/dependency_links.txt
7+
colour_analysis.egg-info/requires.txt
8+
colour_analysis.egg-info/top_level.txt

‎colour_analysis.egg-info/dependency_links.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎colour_analysis.egg-info/requires.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
[development]
3+
coverage
4+
flake8
5+
invoke
6+
nose
7+
pytest
8+
yapf==0.23

0 commit comments

Comments
 (0)