Version 0.8.6

CHanged main function behaviour a bit.

HISTORY.rst

@@ -1,3 +1,8 @@
+v0.8.6 (2016-04-16)
+===================
+- Changed the main function of `sudokuextract.extract` to print and
+  not return anything.
+
 v0.8.5 (2016-03-10)
 ===================
 - Replace ndi.binary_fill_holes with a binary_erosion and increased number of blobs to test to 2.

sudokuextract/__init__.py

@@ -38,7 +38,7 @@
 # version.
 _version_major = 0
 _version_minor = 8
-_version_patch = 5
+_version_patch = 6
 # _version_extra = '.dev2'
 # _version_extra = 'rc1'
 _version_extra = ''  # Uncomment this for full releases

sudokuextract/extract.py

@@ -62,9 +62,7 @@ def main():
 
     preds, images, subimage = extract_sudoku(image)
     sudoku_string = predictions_to_suduko_string(preds, args.oneliner)
-
     print(sudoku_string)
-    return sudoku_string
 
 if __name__ == '__main__':
     main()

tests/test_se.py

@@ -61,36 +61,40 @@ def _process_an_image(image, correct_sudoku):
     assert parsed_sudoku == correct_sudoku
 
 
-def test_image_1_cmd_1():
+def test_image_1_cmd_1(capsys):
     """Test Image 1 via command line tool."""
     sys.argv = ['parse-sudoku', '-p', _get_img_path(1)]
-    parsed_sudoku = main()
+    main()
+    out, err = capsys.readouterr()
     correct_sudoku = _get_parsed_img(1)
-    assert parsed_sudoku == correct_sudoku
+    assert out.strip() == correct_sudoku
 
 
-def test_image_1_cmd_2():
+def test_image_1_cmd_2(capsys):
     """Test Image 1 via command line tool."""
     sys.argv = ['parse-sudoku', '-p', _get_img_path(1), '--oneliner']
-    parsed_sudoku = main()
+    main()
+    out, err = capsys.readouterr()
     correct_sudoku = _get_parsed_img(1).replace('\n', '')
-    assert parsed_sudoku == correct_sudoku
+    assert out.strip() == correct_sudoku
 
 
-def test_image_2_cmd_1():
+def test_image_2_cmd_1(capsys):
     """Test Image 1 via command line tool."""
     sys.argv = ['parse-sudoku', '-p', _get_img_path(2)]
-    parsed_sudoku = main()
+    main()
+    out, err = capsys.readouterr()
     correct_sudoku = _get_parsed_img(2)
-    assert parsed_sudoku == correct_sudoku
+    assert out.strip() == correct_sudoku
 
 
-def test_image_2_cmd_2():
+def test_image_2_cmd_2(capsys):
     """Test Image 2 via command line tool."""
     sys.argv = ['parse-sudoku', '-p', _get_img_path(2), '--oneliner']
-    parsed_sudoku = main()
+    main()
+    out, err = capsys.readouterr()
     correct_sudoku = _get_parsed_img(2).replace('\n', '')
-    assert parsed_sudoku == correct_sudoku
+    assert out.strip() == correct_sudoku
 
 
 def test_image_1_with_trained_classifier():
@@ -126,10 +130,11 @@ def test_url_1_straight():
     _process_an_image(image, solution)
 
 
-def test_url_1_via_commandline():
+def test_url_1_via_commandline(capsys):
     url = "https://static-secure.guim.co.uk/sys-images/Guardian/Pix/pictures/2013/2/27/1361977880123/Sudoku2437easy.jpg"
     sys.argv = ['parse-sudoku', '-u', url]
-    parsed_sudoku = main()
+    main()
+    out, err = capsys.readouterr()
     solution = ("041006029\n"
                 "300790000\n"
                 "009000308\n"
@@ -139,7 +144,7 @@ def test_url_1_via_commandline():
                 "403000900\n"
                 "000032004\n"
                 "650400730")
-    assert parsed_sudoku == solution
+    assert out.strip() == solution
 
 
 ### Parameterized tests