Skip to content

Commit a275bfb

Browse files
committed
Merge branch 'feature/v0.1.3' into develop
2 parents c18487f + 77c4979 commit a275bfb

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.github/workflows/continuous-integration-quality-unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
poetry install
3939
poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
4040
shell: bash
41-
- name: Lint with flake8
41+
- name: Pre-Commit (All Files)
4242
run: |
43-
poetry run flake8 $CI_PACKAGE --count --show-source --statistics
43+
poetry run pre-commit run --all-files
4444
shell: bash
4545
- name: Test Optimised Python Execution
4646
run: |

CONTRIBUTORS.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Contributors
44
Development & Technical Support
55
-------------------------------
66

7-
- **Thomas Mansencal**, *Visual Effects Artist @ Weta Digital*
7+
- **Thomas Mansencal**, *Lead Pipeline Developer @ WetaFX*
88

99
Project coordination, overall development.
1010

colour_checker_detection/detection/segmentation.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
)
4242
from colour.models import cctf_encoding
4343
from colour.utilities import (
44+
MixinDataclassIterable,
4445
Structure,
4546
as_float_array,
4647
as_int_array,
@@ -149,7 +150,7 @@
149150

150151

151152
@dataclass
152-
class ColourCheckersDetectionData:
153+
class ColourCheckersDetectionData(MixinDataclassIterable):
153154
"""
154155
Colour checkers detection data used for plotting, debugging and further
155156
analysis.
@@ -174,7 +175,7 @@ class ColourCheckersDetectionData:
174175

175176

176177
@dataclass
177-
class ColourCheckerSwatchesData:
178+
class ColourCheckerSwatchesData(MixinDataclassIterable):
178179
"""
179180
Colour checker swatches data used for plotting, debugging and further
180181
analysis.

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
]
2727

2828
intersphinx_mapping = {
29-
"python": ("https://docs.python.org/3.7", None),
29+
"python": ("https://docs.python.org/3.8", None),
3030
"matplotlib": ("https://matplotlib.org/stable", None),
3131
"numpy": ("https://numpy.org/doc/stable", None),
3232
"pandas": ("https://pandas.pydata.org/pandas-docs/dev", None),

utilities/export_todo.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import codecs
1010
import os
11-
from collections import OrderedDict
1211

1312
__copyright__ = "Copyright 2018 Colour Developers"
1413
__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
@@ -46,7 +45,7 @@
4645
]
4746

4847

49-
def extract_todo_items(root_directory: str) -> OrderedDict:
48+
def extract_todo_items(root_directory: str) -> dict:
5049
"""
5150
Extract the TODO items from given directory.
5251
@@ -57,11 +56,11 @@ def extract_todo_items(root_directory: str) -> OrderedDict:
5756
5857
Returns
5958
-------
60-
:class:`collections.OrderedDict`
59+
:class:`dict`
6160
TODO items.
6261
"""
6362

64-
todo_items = OrderedDict()
63+
todo_items = {}
6564
for root, dirnames, filenames in os.walk(root_directory):
6665
for filename in filenames:
6766
if not filename.endswith(".py"):
@@ -97,7 +96,7 @@ def extract_todo_items(root_directory: str) -> OrderedDict:
9796
return todo_items
9897

9998

100-
def export_todo_items(todo_items: OrderedDict, file_path: str):
99+
def export_todo_items(todo_items: dict, file_path: str):
101100
"""
102101
Export TODO items to given file.
103102

0 commit comments

Comments
 (0)