Skip to content

Commit 5b5702f

Browse files
committed
Merge branch 'feature/v0.1.2' into develop
2 parents 102dda5 + 2b74ed8 commit 5b5702f

File tree

3 files changed

+28
-3
lines changed

3 files changed

+28
-3
lines changed

TODO.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ TODO
1111

1212
- colour_checker_detection/detection/tests/test_segmentation.py
1313

14-
- Line 207 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
15-
- Line 492 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
14+
- Line 227 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
15+
- Line 517 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
1616

1717
About
1818
-----

colour_checker_detection/detection/tests/test_segmentation.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ def test_as_8_bit_BGR_image(self):
8585
as_8_bit_BGR_image` definition unit tests methods.
8686
"""
8787

88+
# Skipping unit test when "png" files are missing, e.g. when testing
89+
# the distributed "Python" package.
90+
if len(PNG_FILES) > 0:
91+
return
92+
8893
image_i = read_image(PNG_FILES[0])
8994
image_o = as_8_bit_BGR_image(image_i)
9095

@@ -106,6 +111,11 @@ def test_adjust_image(self):
106111
adjust_image` definition unit tests methods.
107112
"""
108113

114+
# Skipping unit test when "png" files are missing, e.g. when testing
115+
# the distributed "Python" package.
116+
if len(PNG_FILES) > 0:
117+
return
118+
109119
image = adjust_image(read_image(PNG_FILES[0]))
110120
self.assertEqual(image.shape[1], WORKING_WIDTH)
111121

@@ -180,6 +190,11 @@ def test_crop_and_level_image_with_rectangle(self):
180190
crop_and_level_image_with_rectangle` definition unit tests methods.
181191
"""
182192

193+
# Skipping unit test when "png" files are missing, e.g. when testing
194+
# the distributed "Python" package.
195+
if len(PNG_FILES) > 0:
196+
return
197+
183198
image = as_8_bit_BGR_image(adjust_image(read_image(PNG_FILES[0])))
184199
rectangle = (
185200
(832.99865723, 473.05020142),
@@ -205,6 +220,11 @@ def test_colour_checkers_coordinates_segmentation(self):
205220
colour_checkers_coordinates_segmentation` definition unit tests methods.
206221
"""
207222

223+
# Skipping unit test when "png" files are missing, e.g. when testing
224+
# the distributed "Python" package.
225+
if len(PNG_FILES) > 0:
226+
return
227+
208228
# TODO: Unit test is only reproducible on "macOs", skipping other OSes.
209229
if platform.system() in ('Windows', 'Microsoft', 'Linux'):
210230
return
@@ -490,6 +510,11 @@ def test_detect_colour_checkers_segmentation(self):
490510
detect_colour_checkers_segmentation` definition unit tests methods.
491511
"""
492512

513+
# Skipping unit test when "png" files are missing, e.g. when testing
514+
# the distributed "Python" package.
515+
if len(PNG_FILES) > 0:
516+
return
517+
493518
# TODO: Unit test is only reproducible on "macOs", skipping other OSes.
494519
if platform.system() in ('Windows', 'Microsoft', 'Linux'):
495520
return

tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ def virtualise(ctx, tests=True):
403403
unique_name))
404404
with ctx.cd(unique_name):
405405
ctx.run('poetry env use 3')
406-
ctx.run('poetry install --extras "optional plotting"')
406+
ctx.run('poetry install')
407407
ctx.run('source $(poetry env info -p)/bin/activate')
408408
ctx.run('python -c "import imageio;'
409409
'imageio.plugins.freeimage.download()"')

0 commit comments

Comments
 (0)