Skip to content

Commit 6b4ec09

Browse files
committed
Merge branch 'feature/v0.2.0' into develop
2 parents b0d1d35 + 827f98d commit 6b4ec09

File tree

6 files changed

+44
-31
lines changed

6 files changed

+44
-31
lines changed

TODO.rst

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,27 @@ TODO
66

77
- colour_checker_detection/__init__.py
88

9-
- Line 84 : # TODO: Remove legacy printing support when deemed appropriate.
9+
- Line 92 : # TODO: Remove legacy printing support when deemed appropriate.
10+
11+
12+
- colour_checker_detection/detection/common.py
13+
14+
- Line 126 : # TODO: Update when "Colour" 0.4.5 is released.
15+
- Line 1131 : # TODO: Update when "Colour" 0.4.5 is released.
16+
17+
18+
- colour_checker_detection/detection/tests/test_inference.py
19+
20+
- Line 62 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
21+
- Line 66 : # TODO: Enable when "torch" is available on Python 3.12.
22+
- Line 101 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
23+
- Line 105 : # TODO: Enable when "torch" is available on Python 3.12.
1024

1125

1226
- colour_checker_detection/detection/tests/test_segmentation.py
1327

14-
- Line 251 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
15-
- Line 353 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
16-
- Line 398 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
28+
- Line 59 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
29+
- Line 151 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
1730

1831
About
1932
-----

colour_checker_detection/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
__application_name__ = "Colour - Checker Detection"
6262

6363
__major_version__ = "0"
64-
__minor_version__ = "1"
65-
__change_version__ = "6"
64+
__minor_version__ = "2"
65+
__change_version__ = "0"
6666
__version__ = ".".join(
6767
(__major_version__, __minor_version__, __change_version__)
6868
)

colour_checker_detection/detection/common.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def as_float32_array(a: ArrayLike) -> NDArrayFloat:
221221
Examples
222222
--------
223223
>>> as_float32_array([1, 2, 3]) # doctest: +ELLIPSIS
224-
array([ 1., 2., 3.]...)
224+
array([...1...,...2...,...3...]...)
225225
"""
226226

227227
return as_float_array(a, dtype=DTYPE_FLOAT_DEFAULT)
@@ -314,14 +314,14 @@ def swatch_colours(image: ArrayLike, masks: ArrayLike) -> NDArrayFloat:
314314
>>> xx, yy = np.meshgrid(x, y)
315315
>>> image = tstack([xx, yy, zeros(xx.shape)])
316316
>>> swatch_colours(image, swatch_masks(16, 8, 4, 2, 1)) # doctest: +ELLIPSIS
317-
array([[ 0.1 ..., 0.2142857..., 0. ...],
318-
[ 0.3666666..., 0.2142857..., 0. ...],
319-
[ 0.6333333..., 0.2142857..., 0. ...],
320-
[ 0.9 ..., 0.2142857..., 0. ...],
321-
[ 0.1 ..., 0.7857142..., 0. ...],
322-
[ 0.3666666..., 0.7857142..., 0. ...],
323-
[ 0.6333333..., 0.7857142..., 0. ...],
324-
[ 0.9 ..., 0.7857142..., 0. ...]]...)
317+
array([[...0.1...,...0.2142...,...0...],
318+
[...0.3...,...0.2142...,...0...],
319+
[...0.6...,...0.2142...,...0...],
320+
[...0.9...,...0.2142...,...0...],
321+
[...0.1...,...0.7857...,...0...],
322+
[...0.3...,...0.7857...,...0...],
323+
[...0.6...,...0.7857...,...0...],
324+
[...0.9...,...0.7857...,...0...]]...)
325325
"""
326326

327327
image = as_array(image)

docs/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
accessible-pygments==0.0.4 ; python_version >= "3.9" and python_version < "3.13"
2-
alabaster==0.7.13 ; python_version >= "3.9" and python_version < "3.13"
2+
alabaster==0.7.16 ; python_version >= "3.9" and python_version < "3.13"
33
babel==2.14.0 ; python_version >= "3.9" and python_version < "3.13"
44
beautifulsoup4==4.12.2 ; python_version >= "3.9" and python_version < "3.13"
55
biblib-simple==0.1.2 ; python_version >= "3.9" and python_version < "3.13"
@@ -16,7 +16,7 @@ imageio==2.33.1 ; python_version >= "3.9" and python_version < "3.13"
1616
imagesize==1.4.1 ; python_version >= "3.9" and python_version < "3.13"
1717
importlib-metadata==7.0.1 ; python_version >= "3.9" and python_version < "3.10"
1818
importlib-resources==6.1.1 ; python_version >= "3.9" and python_version < "3.10"
19-
jinja2==3.1.2 ; python_version >= "3.9" and python_version < "3.13"
19+
jinja2==3.1.3 ; python_version >= "3.9" and python_version < "3.13"
2020
kiwisolver==1.4.5 ; python_version >= "3.9" and python_version < "3.13"
2121
latexcodec==2.0.1 ; python_version >= "3.9" and python_version < "3.13"
2222
markupsafe==2.1.3 ; python_version >= "3.9" and python_version < "3.13"
@@ -27,7 +27,7 @@ packaging==23.2 ; python_version >= "3.9" and python_version < "3.13"
2727
pillow==10.2.0 ; python_version >= "3.9" and python_version < "3.13"
2828
pybtex==0.24.0 ; python_version >= "3.9" and python_version < "3.13"
2929
pybtex-docutils==1.0.3 ; python_version >= "3.9" and python_version < "3.13"
30-
pydata-sphinx-theme==0.14.4 ; python_version >= "3.9" and python_version < "3.13"
30+
pydata-sphinx-theme==0.15.1 ; python_version >= "3.9" and python_version < "3.13"
3131
pygments==2.17.2 ; python_version >= "3.9" and python_version < "3.13"
3232
pyparsing==3.1.1 ; python_version >= "3.9" and python_version < "3.13"
3333
python-dateutil==2.8.2 ; python_version >= "3.9" and python_version < "3.13"
@@ -40,7 +40,7 @@ snowballstemmer==2.2.0 ; python_version >= "3.9" and python_version < "3.13"
4040
soupsieve==2.5 ; python_version >= "3.9" and python_version < "3.13"
4141
sphinx==7.2.6 ; python_version >= "3.9" and python_version < "3.13"
4242
sphinxcontrib-applehelp==1.0.7 ; python_version >= "3.9" and python_version < "3.13"
43-
sphinxcontrib-bibtex==2.6.1 ; python_version >= "3.9" and python_version < "3.13"
43+
sphinxcontrib-bibtex==2.6.2 ; python_version >= "3.9" and python_version < "3.13"
4444
sphinxcontrib-devhelp==1.0.5 ; python_version >= "3.9" and python_version < "3.13"
4545
sphinxcontrib-htmlhelp==2.0.4 ; python_version >= "3.9" and python_version < "3.13"
4646
sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.9" and python_version < "3.13"

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "colour-checker-detection"
3-
version = "0.1.6"
3+
version = "0.2.0"
44
description = "Colour checker detection with Python"
55
license = "BSD-3-Clause"
66
authors = ["Colour Developers <colour-developers@colour-science.org>"]

requirements.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
accessible-pygments==0.0.4 ; python_version >= "3.9" and python_version < "3.13"
2-
alabaster==0.7.13 ; python_version >= "3.9" and python_version < "3.13"
2+
alabaster==0.7.16 ; python_version >= "3.9" and python_version < "3.13"
33
anyio==4.2.0 ; python_version >= "3.9" and python_version < "3.13"
44
appnope==0.1.3 ; python_version >= "3.9" and python_version < "3.13" and platform_system == "Darwin"
55
argon2-cffi==23.1.0 ; python_version >= "3.9" and python_version < "3.13"
@@ -53,7 +53,7 @@ isoduration==20.11.0 ; python_version >= "3.9" and python_version < "3.13"
5353
jaraco-classes==3.3.0 ; python_version >= "3.9" and python_version < "3.13"
5454
jedi==0.19.1 ; python_version >= "3.9" and python_version < "3.13"
5555
jeepney==0.8.0 ; python_version >= "3.9" and python_version < "3.13" and sys_platform == "linux"
56-
jinja2==3.1.2 ; python_version >= "3.9" and python_version < "3.13"
56+
jinja2==3.1.3 ; python_version >= "3.9" and python_version < "3.13"
5757
json5==0.9.14 ; python_version >= "3.9" and python_version < "3.13"
5858
jsonpointer==2.4 ; python_version >= "3.9" and python_version < "3.13"
5959
jsonschema==4.20.0 ; python_version >= "3.9" and python_version < "3.13"
@@ -62,10 +62,10 @@ jsonschema[format-nongpl]==4.20.0 ; python_version >= "3.9" and python_version <
6262
jupyter==1.0.0 ; python_version >= "3.9" and python_version < "3.13"
6363
jupyter-client==8.6.0 ; python_version >= "3.9" and python_version < "3.13"
6464
jupyter-console==6.6.3 ; python_version >= "3.9" and python_version < "3.13"
65-
jupyter-core==5.6.1 ; python_version >= "3.9" and python_version < "3.13"
65+
jupyter-core==5.7.1 ; python_version >= "3.9" and python_version < "3.13"
6666
jupyter-events==0.9.0 ; python_version >= "3.9" and python_version < "3.13"
6767
jupyter-lsp==2.2.1 ; python_version >= "3.9" and python_version < "3.13"
68-
jupyter-server==2.12.1 ; python_version >= "3.9" and python_version < "3.13"
68+
jupyter-server==2.12.3 ; python_version >= "3.9" and python_version < "3.13"
6969
jupyter-server-terminals==0.5.1 ; python_version >= "3.9" and python_version < "3.13"
7070
jupyterlab==4.0.10 ; python_version >= "3.9" and python_version < "3.13"
7171
jupyterlab-pygments==0.3.0 ; python_version >= "3.9" and python_version < "3.13"
@@ -80,7 +80,7 @@ matplotlib==3.8.2 ; python_version >= "3.9" and python_version < "3.13"
8080
matplotlib-inline==0.1.6 ; python_version >= "3.9" and python_version < "3.13"
8181
mdurl==0.1.2 ; python_version >= "3.9" and python_version < "3.13"
8282
mistune==3.0.2 ; python_version >= "3.9" and python_version < "3.13"
83-
more-itertools==10.1.0 ; python_version >= "3.9" and python_version < "3.13"
83+
more-itertools==10.2.0 ; python_version >= "3.9" and python_version < "3.13"
8484
nbclient==0.9.0 ; python_version >= "3.9" and python_version < "3.13"
8585
nbconvert==7.14.0 ; python_version >= "3.9" and python_version < "3.13"
8686
nbformat==5.9.2 ; python_version >= "3.9" and python_version < "3.13"
@@ -109,10 +109,10 @@ pure-eval==0.2.2 ; python_version >= "3.9" and python_version < "3.13"
109109
pybtex==0.24.0 ; python_version >= "3.9" and python_version < "3.13"
110110
pybtex-docutils==1.0.3 ; python_version >= "3.9" and python_version < "3.13"
111111
pycparser==2.21 ; python_version >= "3.9" and python_version < "3.13"
112-
pydata-sphinx-theme==0.14.4 ; python_version >= "3.9" and python_version < "3.13"
112+
pydata-sphinx-theme==0.15.1 ; python_version >= "3.9" and python_version < "3.13"
113113
pygments==2.17.2 ; python_version >= "3.9" and python_version < "3.13"
114114
pyparsing==3.1.1 ; python_version >= "3.9" and python_version < "3.13"
115-
pyright==1.1.344 ; python_version >= "3.9" and python_version < "3.13"
115+
pyright==1.1.345 ; python_version >= "3.9" and python_version < "3.13"
116116
pytest==7.4.4 ; python_version >= "3.9" and python_version < "3.13"
117117
pytest-cov==4.1.0 ; python_version >= "3.9" and python_version < "3.13"
118118
pytest-xdist==3.5.0 ; python_version >= "3.9" and python_version < "3.13"
@@ -126,7 +126,7 @@ pyzmq==25.1.2 ; python_version >= "3.9" and python_version < "3.13"
126126
qtconsole==5.5.1 ; python_version >= "3.9" and python_version < "3.13"
127127
qtpy==2.4.1 ; python_version >= "3.9" and python_version < "3.13"
128128
readme-renderer==42.0 ; python_version >= "3.9" and python_version < "3.13"
129-
referencing==0.32.0 ; python_version >= "3.9" and python_version < "3.13"
129+
referencing==0.32.1 ; python_version >= "3.9" and python_version < "3.13"
130130
requests==2.31.0 ; python_version >= "3.9" and python_version < "3.13"
131131
requests-toolbelt==1.0.0 ; python_version >= "3.9" and python_version < "3.13"
132132
restructuredtext-lint==1.4.0 ; python_version >= "3.9" and python_version < "3.13"
@@ -145,7 +145,7 @@ snowballstemmer==2.2.0 ; python_version >= "3.9" and python_version < "3.13"
145145
soupsieve==2.5 ; python_version >= "3.9" and python_version < "3.13"
146146
sphinx==7.2.6 ; python_version >= "3.9" and python_version < "3.13"
147147
sphinxcontrib-applehelp==1.0.7 ; python_version >= "3.9" and python_version < "3.13"
148-
sphinxcontrib-bibtex==2.6.1 ; python_version >= "3.9" and python_version < "3.13"
148+
sphinxcontrib-bibtex==2.6.2 ; python_version >= "3.9" and python_version < "3.13"
149149
sphinxcontrib-devhelp==1.0.5 ; python_version >= "3.9" and python_version < "3.13"
150150
sphinxcontrib-htmlhelp==2.0.4 ; python_version >= "3.9" and python_version < "3.13"
151151
sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.9" and python_version < "3.13"
@@ -159,12 +159,12 @@ tomli==2.0.1 ; python_version >= "3.9" and python_full_version <= "3.11.0a6"
159159
tornado==6.4 ; python_version >= "3.9" and python_version < "3.13"
160160
traitlets==5.14.1 ; python_version >= "3.9" and python_version < "3.13"
161161
twine==4.0.2 ; python_version >= "3.9" and python_version < "3.13"
162-
types-python-dateutil==2.8.19.14 ; python_version >= "3.9" and python_version < "3.13"
162+
types-python-dateutil==2.8.19.20240106 ; python_version >= "3.9" and python_version < "3.13"
163163
typing-extensions==4.9.0 ; python_version >= "3.9" and python_version < "3.13"
164164
uri-template==1.3.0 ; python_version >= "3.9" and python_version < "3.13"
165165
urllib3==2.1.0 ; python_version >= "3.9" and python_version < "3.13"
166166
virtualenv==20.25.0 ; python_version >= "3.9" and python_version < "3.13"
167-
wcwidth==0.2.12 ; python_version >= "3.9" and python_version < "3.13"
167+
wcwidth==0.2.13 ; python_version >= "3.9" and python_version < "3.13"
168168
webcolors==1.13 ; python_version >= "3.9" and python_version < "3.13"
169169
webencodings==0.5.1 ; python_version >= "3.9" and python_version < "3.13"
170170
websocket-client==1.7.0 ; python_version >= "3.9" and python_version < "3.13"

0 commit comments

Comments
 (0)