Skip to content

Commit fd87c70

Browse files
KelSolaarKelSolaar
committed
Merge branch 'feature/v0.1.2' into develop
2 parents 246e441 + 8fed129 commit fd87c70

File tree

14 files changed

+38
-60
lines changed

14 files changed

+38
-60
lines changed

‎.github/workflows/continuous-integration.yml

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Unix Build
88
strategy:
99
matrix:
10-
os: [ubuntu-18.04, macOS-10.14]
10+
os: [ubuntu-18.04, macOS-latest]
1111
python-version: [3.6, 3.7]
1212
runs-on: ${{ matrix.os }}
1313
steps:
@@ -19,17 +19,10 @@ jobs:
1919
CI_PYTHON_VERSION=${{ matrix.python-version }}
2020
CI_PACKAGE=colour_checker_detection
2121
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}"
2622
COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
2723
echo ::set-env name=CI_PYTHON_VERSION::$CI_PYTHON_VERSION
2824
echo ::set-env name=CI_PACKAGE::$CI_PACKAGE
2925
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
3326
echo ::set-env name=COVERALLS_REPO_TOKEN::$COVERALLS_REPO_TOKEN
3427
- name: Set up Python ${{ matrix.python-version }}
3528
uses: actions/setup-python@v1
@@ -38,7 +31,7 @@ jobs:
3831
- name: Install Poetry
3932
run: |
4033
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
41-
python get-poetry.py --preview
34+
python get-poetry.py --preview --version 1.0.0b3
4235
PATH=$HOME/.poetry/bin:$PATH
4336
echo ::set-env name=PATH::$PATH
4437
- name: Install Package Dependencies
@@ -53,17 +46,12 @@ jobs:
5346
- name: Test with nosetests
5447
run: |
5548
source $(poetry env info -p)/bin/activate
56-
python -W ignore -m nose -v --nocapture --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=$CI_PACKAGE $CI_PACKAGE
49+
python -W ignore -m nose -q -v --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=$CI_PACKAGE $CI_PACKAGE
5750
- name: Upload Coverage to coveralls.io
5851
if: matrix.python-version == '3.6' || matrix.python-version == '3.7'
5952
run: |
6053
source $(poetry env info -p)/bin/activate
6154
if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else coveralls; fi
62-
- name: Notify Slack
63-
if: always()
64-
run: |
65-
if [ "${{ job.status }}" == "Success" ]; then CI_SLACK_NOTIFICATION="$CI_SLACK_SUCCESS_NOTIFICATION"; else CI_SLACK_NOTIFICATION="$CI_SLACK_FAILURE_NOTIFICATION"; fi
66-
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
6755
windows-build:
6856
name: Windows Build
6957
strategy:
@@ -80,17 +68,10 @@ jobs:
8068
set CI_PYTHON_VERSION=${{ matrix.python-version }}
8169
set CI_PACKAGE=colour_checker_detection
8270
set CI_SHA=${{ github.sha }}
83-
set CI_SLACK_WEBHOOK=${{ secrets.SLACK_WEBHOOK }}
84-
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\"}"
85-
set CI_SLACK_FAILURE_NOTIFICATION=%CI_SLACK_SUCCESS_NOTIFICATION:4CAF50=F44336%
86-
set CI_SLACK_FAILURE_NOTIFICATION=%CI_SLACK_FAILURE_NOTIFICATION:succeeded=failed%
8771
set COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
8872
echo ::set-env name=CI_PYTHON_VERSION::%CI_PYTHON_VERSION%
8973
echo ::set-env name=CI_PACKAGE::%CI_PACKAGE%
9074
echo ::set-env name=CI_SHA::%CI_SHA%
91-
echo ::set-env name=CI_SLACK_WEBHOOK::%CI_SLACK_WEBHOOK%
92-
echo ::set-env name=CI_SLACK_SUCCESS_NOTIFICATION::%CI_SLACK_SUCCESS_NOTIFICATION%
93-
echo ::set-env name=CI_SLACK_FAILURE_NOTIFICATION::%CI_SLACK_FAILURE_NOTIFICATION%
9475
echo ::set-env name=COVERALLS_REPO_TOKEN::%COVERALLS_REPO_TOKEN%
9576
shell: cmd
9677
- name: Set up Python ${{ matrix.python-version }}
@@ -100,7 +81,7 @@ jobs:
10081
- name: Install Poetry
10182
run: |
10283
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
103-
python get-poetry.py --preview
84+
python get-poetry.py --preview --version 1.0.0b3
10485
set PATH=%USERPROFILE%\.poetry\bin;%PATH%
10586
echo ::set-env name=PATH::%PATH%
10687
shell: cmd
@@ -120,17 +101,11 @@ jobs:
120101
- name: Test with nosetests
121102
run: |
122103
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
123-
python -W ignore -m nose -v --nocapture --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=%CI_PACKAGE% %CI_PACKAGE%
104+
python -W ignore -m nose -q -v --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=%CI_PACKAGE% %CI_PACKAGE%
124105
shell: cmd
125106
- name: Upload Coverage to coveralls.io
126107
if: matrix.python-version == '3.6' || matrix.python-version == '3.7'
127108
run: |
128109
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
129110
IF "%COVERALLS_REPO_TOKEN%"=="" (echo "COVERALLS_REPO_TOKEN" secret is undefined!) ELSE (coveralls)
130111
shell: cmd
131-
- name: Notify Slack
132-
if: always()
133-
run: |
134-
IF "${{ job.status }}"=="Success" (set CI_SLACK_NOTIFICATION=%CI_SLACK_SUCCESS_NOTIFICATION%) ELSE (set CI_SLACK_NOTIFICATION=%CI_SLACK_FAILURE_NOTIFICATION%)
135-
IF "%CI_SLACK_WEBHOOK%"=="" (echo "SLACK_WEBHOOK" secret is undefined!) ELSE (curl -k -d %CI_SLACK_NOTIFICATION% -X POST %CI_SLACK_WEBHOOK%)
136-
shell: cmd

‎BIBLIOGRAPHY.bib

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@misc{Abecassis2011,
2+
title = {OpenCV - Rotation (Deskewing)},
23
author = {Abecassis, Felix},
3-
title = {{OpenCV - Rotation (Deskewing)}},
4+
year = 2011,
45
url = {http://felix.abecassis.me/2011/10/opencv-rotation-deskewing/},
56
urldate = {2018-10-27},
6-
year = 2011,
77
}

‎CONTRIBUTORS.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ About
1616
-----
1717

1818
| **Colour - Checker Detection** by Colour Developers
19-
| Copyright © 2018-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
19+
| Copyright © 2018-2020 – Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
2020
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
2121
| `https://github.com/colour-science/colour-checker-detection <https://github.com/colour-science/colour-checker-detection>`__

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2018-2019, Colour Developers
1+
Copyright (c) 2018-2020, Colour Developers
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

‎README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Colour - Checker Detection
55
66
|actions| |coveralls| |codacy| |version|
77

8-
.. |actions| image:: https://github.com/colour-science/colour-checker-detection/workflows/Continuous%20Integration/badge.svg
8+
.. |actions| image:: https://img.shields.io/github/workflow/status/colour-science/colour-checker-detection/Continuous%20Integration?label=actions&logo=github&style=flat-square
99
:target: https://github.com/colour-science/colour-checker-detection/actions
1010
:alt: Develop Build Status
1111
.. |coveralls| image:: http://img.shields.io/coveralls/colour-science/colour-checker-detection/develop.svg?style=flat-square
@@ -113,6 +113,6 @@ About
113113
-----
114114

115115
| **Colour - Checker Detection** by Colour Developers
116-
| Copyright © 2018-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
116+
| Copyright © 2018-2020 – Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
117117
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
118118
| `https://github.com/colour-science/colour-checker-detection <https://github.com/colour-science/colour-checker-detection>`__

‎TODO.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ About
1818
-----
1919

2020
| **Colour - Checker Detection** by Colour Developers
21-
| Copyright © 2018-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
21+
| Copyright © 2018-2020 – Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
2222
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
2323
| `https://github.com/colour-science/colour-checker-detection <https://github.com/colour-science/colour-checker-detection>`__

‎colour_checker_detection/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
detect_colour_checkers_segmentation)
2525

2626
__author__ = 'Colour Developers'
27-
__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
27+
__copyright__ = 'Copyright (C) 2018-2020 - Colour Developers'
2828
__license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
2929
__maintainer__ = 'Colour Developers'
30-
__email__ = 'colour-science@googlegroups.com'
30+
__email__ = 'colour-developers@colour-science.org'
3131
__status__ = 'Production'
3232

3333
__all__ = [

‎colour_checker_detection/detection/segmentation.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
References
1313
----------
1414
- :cite:`Abecassis2011` : Abecassis, F. (2011). OpenCV - Rotation
15-
(Deskewing). Retrieved October 27, 2018, from
16-
http://felix.abecassis.me/2011/10/opencv-rotation-deskewing/
15+
(Deskewing). Retrieved October 27, 2018, from http://felix.abecassis.me/\
16+
2011/10/opencv-rotation-deskewing/
1717
"""
1818

1919
from __future__ import division, unicode_literals
@@ -26,10 +26,10 @@
2626
from colour.utilities import as_float_array, as_int_array, as_int
2727

2828
__author__ = 'Colour Developers'
29-
__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
29+
__copyright__ = 'Copyright (C) 2018-2020 - Colour Developers'
3030
__license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
3131
__maintainer__ = 'Colour Developers'
32-
__email__ = 'colour-science@googlegroups.com'
32+
__email__ = 'colour-developers@colour-science.org'
3333
__status__ = 'Production'
3434

3535
__all__ = [

‎colour_checker_detection/detection/tests/test_segmentation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
extract_colour_checkers_segmentation, detect_colour_checkers_segmentation)
2626

2727
__author__ = 'Colour Developers'
28-
__copyright__ = 'Copyright (C) 2018-2019 - Colour Developers'
28+
__copyright__ = 'Copyright (C) 2018-2020 - Colour Developers'
2929
__license__ = 'New BSD License - https://opensource.org/licenses/BSD-3-Clause'
3030
__maintainer__ = 'Colour Developers'
31-
__email__ = 'colour-science@googlegroups.com'
31+
__email__ = 'colour-developers@colour-science.org'
3232
__status__ = 'Production'
3333

3434
__all__ = [

‎docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,6 @@ About
108108
-----
109109

110110
| **Colour - Checker Detection** by Colour Developers
111-
| Copyright © 2018-2019 – Colour Developers – `colour-science@googlegroups.com <colour-science@googlegroups.com>`__
111+
| Copyright © 2018-2020 – Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
112112
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
113113
| `https://github.com/colour-science/colour-checker-detection <https://github.com/colour-science/colour-checker-detection>`__

0 commit comments

Comments
 (0)