Skip to content

Commit 6d8e3a7

Browse files
KelSolaarKelSolaar
committed
Merge branch 'release/v0.1.5'
# Conflicts: # colour_demosaicing/resources/colour-demosaicing-examples-datasets
2 parents 7fa189e + 9e43335 commit 6d8e3a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+681
-398
lines changed

‎.coveragerc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
[run]
22
source = colour_demosaicing
3+
[report]
4+
exclude_lines =
5+
pragma: no cover
6+
if __name__ == .__main__.:
7+
pass

‎.github/workflows/continuous-integration.yml‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
name: Continuous Integration
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
unix-build:
7+
name: Unix Build
8+
strategy:
9+
matrix:
10+
os: [ubuntu-18.04, macOS-10.14]
11+
python-version: [2.7, 3.6, 3.7]
12+
runs-on: ${{ matrix.os }}
13+
steps:
14+
- uses: actions/checkout@v1
15+
with:
16+
submodules: true
17+
- name: Environment Variables
18+
run: |
19+
CI_PYTHON_VERSION=${{ matrix.python-version }}
20+
CI_PACKAGE=colour_demosaicing
21+
CI_SHA=${{ github.sha }}
22+
CI_SLACK_WEBHOOK=${{ secrets.SLACK_WEBHOOK }}
23+
CI_SLACK_SUCCESS_NOTIFICATION="payload={\"attachments\": [{\"color\": \"#4CAF50\", \"author_name\": \"Python ${{ matrix.python-version }} build on ${{ matrix.os }}\", \"text\": \"Build for commit *${CI_SHA:0:7}* succeeded!\", \"title\": \"${{ github.repository }}@${{ github.ref }}\", \"title_link\": \"https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks\", \"footer\": \"Triggered by ${{ github.actor }}\"}], \"username\":\"Github Actions @ ${{ github.repository }}\", \"channel\":\"#continuous-integration\", \"icon_url\":\"https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png\"}"
24+
CI_SLACK_FAILURE_NOTIFICATION="${CI_SLACK_SUCCESS_NOTIFICATION/4CAF50/F44336}"
25+
CI_SLACK_FAILURE_NOTIFICATION="${CI_SLACK_FAILURE_NOTIFICATION/succeeded/failed}"
26+
COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
27+
echo ::set-env name=CI_PYTHON_VERSION::$CI_PYTHON_VERSION
28+
echo ::set-env name=CI_PACKAGE::$CI_PACKAGE
29+
echo ::set-env name=CI_SHA::$CI_SHA
30+
echo ::set-env name=CI_SLACK_WEBHOOK::$CI_SLACK_WEBHOOK
31+
echo ::set-env name=CI_SLACK_SUCCESS_NOTIFICATION::$CI_SLACK_SUCCESS_NOTIFICATION
32+
echo ::set-env name=CI_SLACK_FAILURE_NOTIFICATION::$CI_SLACK_FAILURE_NOTIFICATION
33+
echo ::set-env name=COVERALLS_REPO_TOKEN::$COVERALLS_REPO_TOKEN
34+
- name: Set up Python ${{ matrix.python-version }}
35+
uses: actions/setup-python@v1
36+
with:
37+
python-version: ${{ matrix.python-version }}
38+
- name: Install Poetry
39+
run: |
40+
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
41+
python get-poetry.py --preview
42+
PATH=$HOME/.poetry/bin:$PATH
43+
echo ::set-env name=PATH::$PATH
44+
- name: Install Package Dependencies
45+
run: |
46+
poetry install
47+
poetry env use $CI_PYTHON_VERSION
48+
source $(poetry env info -p)/bin/activate
49+
python -c "import imageio;imageio.plugins.freeimage.download()"
50+
- name: Lint with flake8
51+
run: |
52+
source $(poetry env info -p)/bin/activate
53+
flake8 $CI_PACKAGE --count --show-source --statistics
54+
- name: Test with nosetests
55+
run: |
56+
source $(poetry env info -p)/bin/activate
57+
python -W ignore -m nose --nocapture --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=$CI_PACKAGE $CI_PACKAGE
58+
- name: Upload Coverage to coveralls.io
59+
if: matrix.python-version == '3.6' || matrix.python-version == '3.7'
60+
run: |
61+
source $(poetry env info -p)/bin/activate
62+
if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else coveralls; fi
63+
- name: Notify Slack
64+
if: always()
65+
run: |
66+
if [ "${{ job.status }}" == "Success" ]; then CI_SLACK_NOTIFICATION="$CI_SLACK_SUCCESS_NOTIFICATION"; else CI_SLACK_NOTIFICATION="$CI_SLACK_FAILURE_NOTIFICATION"; fi
67+
if [ -z "$CI_SLACK_WEBHOOK" ]; then echo \"SLACK_WEBHOOK\" secret is undefined!; else curl -k -d "$CI_SLACK_NOTIFICATION" -X POST $CI_SLACK_WEBHOOK; fi
68+
windows-build:
69+
name: Windows Build
70+
strategy:
71+
matrix:
72+
os: [windows-2019]
73+
python-version: [2.7, 3.6, 3.7]
74+
runs-on: ${{ matrix.os }}
75+
steps:
76+
- uses: actions/checkout@v1
77+
with:
78+
submodules: true
79+
- name: Environment Variables
80+
run: |
81+
set CI_PYTHON_VERSION=${{ matrix.python-version }}
82+
set CI_PACKAGE=colour_demosaicing
83+
set CI_SHA=${{ github.sha }}
84+
set CI_SLACK_WEBHOOK=${{ secrets.SLACK_WEBHOOK }}
85+
set CI_SLACK_SUCCESS_NOTIFICATION="payload={\"attachments\": [{\"color\": \"#4CAF50\", \"author_name\": \"Python ${{ matrix.python-version }} build on ${{ matrix.os }}\", \"text\": \"Build for commit *"%CI_SHA:~0,7%"* succeeded!\", \"title\": \"${{ github.repository }}@${{ github.ref }}\", \"title_link\": \"https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks\", \"footer\": \"Triggered by ${{ github.actor }}\"}], \"username\":\"Github Actions @ ${{ github.repository }}\", \"channel\":\"#continuous-integration\", \"icon_url\":\"https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png\"}"
86+
set CI_SLACK_FAILURE_NOTIFICATION=%CI_SLACK_SUCCESS_NOTIFICATION:4CAF50=F44336%
87+
set CI_SLACK_FAILURE_NOTIFICATION=%CI_SLACK_FAILURE_NOTIFICATION:succeeded=failed%
88+
set COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
89+
echo ::set-env name=CI_PYTHON_VERSION::%CI_PYTHON_VERSION%
90+
echo ::set-env name=CI_PACKAGE::%CI_PACKAGE%
91+
echo ::set-env name=CI_SHA::%CI_SHA%
92+
echo ::set-env name=CI_SLACK_WEBHOOK::%CI_SLACK_WEBHOOK%
93+
echo ::set-env name=CI_SLACK_SUCCESS_NOTIFICATION::%CI_SLACK_SUCCESS_NOTIFICATION%
94+
echo ::set-env name=CI_SLACK_FAILURE_NOTIFICATION::%CI_SLACK_FAILURE_NOTIFICATION%
95+
echo ::set-env name=COVERALLS_REPO_TOKEN::%COVERALLS_REPO_TOKEN%
96+
shell: cmd
97+
- name: Set up Python ${{ matrix.python-version }}
98+
uses: actions/setup-python@v1
99+
with:
100+
python-version: ${{ matrix.python-version }}
101+
- name: Install Poetry
102+
run: |
103+
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
104+
python get-poetry.py --preview
105+
set PATH=%USERPROFILE%\.poetry\bin;%PATH%
106+
echo ::set-env name=PATH::%PATH%
107+
shell: cmd
108+
- name: Install Package Dependencies
109+
run: |
110+
call poetry install
111+
FOR /F %%a IN ('poetry env info -p') DO SET CI_VIRTUAL_ENVIRONMENT=%%a
112+
echo ::set-env name=CI_VIRTUAL_ENVIRONMENT::%CI_VIRTUAL_ENVIRONMENT%
113+
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
114+
python -c "import imageio;imageio.plugins.freeimage.download()"
115+
shell: cmd
116+
- name: Lint with flake8
117+
run: |
118+
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
119+
flake8 %CI_PACKAGE% --count --show-source --statistics
120+
shell: cmd
121+
- name: Test with nosetests
122+
run: |
123+
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
124+
python -W ignore -m nose --nocapture --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=%CI_PACKAGE% %CI_PACKAGE%
125+
shell: cmd
126+
- name: Upload Coverage to coveralls.io
127+
if: matrix.python-version == '3.6' || matrix.python-version == '3.7'
128+
run: |
129+
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
130+
IF "%COVERALLS_REPO_TOKEN%"=="" (echo "COVERALLS_REPO_TOKEN" secret is undefined!) ELSE (coveralls)
131+
shell: cmd
132+
- name: Notify Slack
133+
if: always()
134+
run: |
135+
IF "${{ job.status }}"=="Success" (set CI_SLACK_NOTIFICATION=%CI_SLACK_SUCCESS_NOTIFICATION%) ELSE (set CI_SLACK_NOTIFICATION=%CI_SLACK_FAILURE_NOTIFICATION%)
136+
IF "%CI_SLACK_WEBHOOK%"=="" (echo "SLACK_WEBHOOK" secret is undefined!) ELSE (curl -k -d %CI_SLACK_NOTIFICATION% -X POST %CI_SLACK_WEBHOOK%)
137+
shell: cmd

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ build
88
colour_demosaicing.egg-info
99
dist
1010
docs/_build
11+
docs/generated
12+
poetry.lock

‎.gitmodules‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[submodule "colour_demosaicing/resources/colour-demosaicing-tests-dataset"]
2-
path = colour_demosaicing/resources/colour-demosaicing-tests-dataset
3-
url = https://github.com/colour-science/colour-demosaicing-tests-dataset.git
4-
[submodule "colour_demosaicing/resources/colour-demosaicing-examples-dataset"]
5-
path = colour_demosaicing/resources/colour-demosaicing-examples-dataset
6-
url = https://github.com/colour-science/colour-demosaicing-examples-dataset.git
1+
[submodule "colour_demosaicing/resources/colour-demosaicing-tests-datasets"]
2+
path = colour_demosaicing/resources/colour-demosaicing-tests-datasets
3+
url = https://github.com/colour-science/colour-demosaicing-tests-datasets.git
4+
[submodule "colour_demosaicing/resources/colour-demosaicing-examples-datasets"]
5+
path = colour_demosaicing/resources/colour-demosaicing-examples-datasets
6+
url = https://github.com/colour-science/colour-demosaicing-examples-datasets.git

‎.pre-commit-config.yaml‎

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

‎.readthedocs.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
build:
2+
image: latest
3+
4+
python:
5+
version: 3.6
6+
pip_install: true
7+
extra_requirements:
8+
- read-the-docs

‎.travis.yml‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Contributors
22
============
33

4-
Colour - Demosaicing
5-
--------------------
4+
Development & Technical Support
5+
-------------------------------
66

77
- **Thomas Mansencal**, *Visual Effects Artist @ Weta Digital*
88

@@ -30,6 +30,6 @@ About
3030
-----
3131

3232
| **Colour - Demosaicing** by Colour Developers
33-
| Copyright © 2015-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`_
34-
| This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
35-
| `http://github.com/colour-science/colour-demosaicing <http://github.com/colour-science/colour-demosaicing>`_
33+
| Copyright © 2015-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
34+
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
35+
| `https://github.com/colour-science/colour-demosaicing <https://github.com/colour-science/colour-demosaicing>`__

‎MANIFEST.in‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)