put the checksums in a python file, added more checks for animation files

cleaned up some lint

Author: ChrisBarker-NOAA

.flake8

@@ -13,3 +13,5 @@ exclude =
   conf.py
   build
   dist
+  ./build_gd.py
+  checksums.py

build_gd.py

@@ -11,7 +11,6 @@
 look in the "if __name__" clause at the bottom:
   you can turn on and off different libs, and different parts of the process
 
-
 """
 
 import os
@@ -24,7 +23,7 @@
 # use this if you want the full install of hdf and netcdf available on your system
 # prefix = "/usr/local"
 
-print "Installing libs to:", prefix
+print("Installing libs to:", prefix)
 
 if not os.path.exists(prefix):
     os.mkdir(prefix)
@@ -37,7 +36,7 @@ def download(name):
 
     # see if it's already there:
     if os.path.isfile(name):
-        print "%s already there -- not downloading again"%name
+        print("%s already there -- not downloading again"%name)
         return 
 
     ## note: bitbucket does not seem t o support direct download links liek this
@@ -53,18 +52,18 @@ def download(name):
         cmd = 'curl -L --output {0} http://sourceforge.net/projects/libpng/files/libpng16/1.6.3/libpng-1.6.3.tar.gz'.format(name)
     else:
         raise Exception("I don't know how to download: %s"%name)
-    print "downloading:", name
-    print cmd
+    print("downloading:", name)
+    print(cmd)
 
     os.system(cmd)
 
 def unpack(lib):
     if os.path.isdir(lib):
-        print "%s already unpacked, not unpacking again"%lib
+        print("%s already unpacked, not unpacking again"%lib)
         return 
     lib = lib +'.tar.gz'
     cmd = "tar -xvf "+lib
-    print "Unpacking:", cmd
+    print("Unpacking:", cmd)
     os.system( cmd )
 
 def configure(lib):
@@ -83,7 +82,7 @@ def configure(lib):
     conf = './configure ' + ' '.join(flags)
 
     os.chdir(lib)
-    print conf
+    print(conf)
     os.system("make clean")
     if os.system(conf):
         os.chdir(cwd)

py_gd/test/build_checksums.py

@@ -15,7 +15,11 @@
 images_dir = "test_images_output"
 checksums = {}
 for name in os.listdir("test_images_output"):
+    if ".DS_Store" in name:
+        continue
     n = os.path.join("test_images_output", name)
     checksums[name] = hashlib.md5(open(n, 'rb').read()).hexdigest()
 
-pprint(checksums)
+with open("checksums.py", 'w', encoding='utf-8') as outfile:
+    outfile.write("checksums = ")
+    pprint(checksums, stream=outfile)

py_gd/test/checksums.py

@@ -0,0 +1,76 @@
+checksums = {'file—name_with_unicode.png': '30eb0faa2123ae24cdffb0d98714b834',
+ 'image_clip.bmp': '6adb4af2332bedec46815f86ac462b9f',
+ 'image_copy.bmp': 'a0e7ffb4ecada86965fcfc60a032cad4',
+ 'image_copy_middle1.bmp': '0ac48cdf5e2652999a33efa6c558a9b7',
+ 'image_copy_middle2.bmp': '09be326e5940e58dfdfa492e03d7e818',
+ 'image_copy_trans.png': '8939012bbd494ec19c8afa639eedafb8',
+ 'image_copy_upper_left.bmp': '24f96fb535350df3cdcdc25bcb95a25a',
+ 'nothing.gif': 'fa2e02f338a8ab98c5c1f3cd280ca505',
+ 'one_frame_delete.gif': '35d46c172f95bf79fa66eb0c4f114ada',
+ 'sample_BW.png': 'a211aaa9093b345bc2c7944aaef76899',
+ 'sample_cividis.png': '5b6af4aa252d0a84969dfe93cdb489ae',
+ 'sample_css4.png': 'b1281b61e5ae0fcf8b4df6a668b6755e',
+ 'sample_inferno.png': '850806ac80c706bf510d38443d3b145a',
+ 'sample_magma.png': '0ebdc1856554e2ed441cf94883a59bf9',
+ 'sample_plasma.png': 'd1e954be4f07b5b4b2bd712022525425',
+ 'sample_tableau.png': '8572a2ff7b7a888238f5d51564ea5cee',
+ 'sample_transparent.png': 'a60406f4c35294111ab6a1eda9eeb63a',
+ 'sample_turbo.png': 'c19b0b0c474ba425c3f5015a086aa8c8',
+ 'sample_twilight.png': 'ef008e3ca66132b49e7ff11d96ac0ba7',
+ 'sample_viridis.png': '8fe4956a7c00136e132ade927b433982',
+ 'sample_web.png': '5d5a8f1de03282ea675cf591eb32b815',
+ 'sample_xkcd.png': '83dd36fb952930d99ac4e68f23045906',
+ 'test_animation.gif': '3abc5d1963116b1a05701978b048ac8a',
+ 'test_animation_multi_colors.gif': 'cd2bd56019572503e31aee6f000f10b4',
+ 'test_animation_reset1.gif': 'a53e5aaebcf441f002927b913c12f213',
+ 'test_animation_reset2.gif': 'ec5961189acd876f73f8132707f13c82',
+ 'test_animation_reset_same.gif': 'ec5961189acd876f73f8132707f13c82',
+ 'test_animation_reuse.gif': 'a45117a3d17f1093d5e395fcc20e69e1',
+ 'test_animation_reuse_not_close.gif': '7587576ac36cd0e2e8bcd8ee4ff52b82',
+ 'test_animation_static.gif': '4639911d250a50f9a76a24bb23031921',
+ 'test_control_points.png': '0d4600278f63c502b4ceafe376148011',
+ 'test_draw_dots_multi_color_indices.png': '415db687d254a58eb6d4cabc4be22ea8',
+ 'test_draw_dots_multi_named_colors.png': 'ca7a67f726517e341b55366a7b08b48e',
+ 'test_image_arc.bmp': 'c0a3c29d49922cac32e4a6fae5c9ac4e',
+ 'test_image_array1.bmp': 'e268130b61eaecdc9d809b771909f7b6',
+ 'test_image_array2.bmp': 'e268130b61eaecdc9d809b771909f7b6',
+ 'test_image_circle.bmp': 'bc3e62938f64c5c084d176b99e7e156a',
+ 'test_image_clear_after.png': 'b6825be7e699ea19bd2571c3b4864dac',
+ 'test_image_clear_after2.png': '30bc477928a84571e60925fd61013a94',
+ 'test_image_clear_before.png': 'd34a1e3576b2732321f32c4ee1117730',
+ 'test_image_clear_before2.png': 'd34a1e3576b2732321f32c4ee1117730',
+ 'test_image_dot.png': '275c79433ded774c5cfebaf45fc8c9fb',
+ 'test_image_dots_large.png': '6eb04cc1e853e29aad7abf0f50fe1e3e',
+ 'test_image_dots_lots.png': 'fa0e7397e03adf2be1f262e4f0134d4f',
+ 'test_image_ellipse.bmp': '543ec0befeb67d131f4df23eeb21e590',
+ 'test_image_grey.bmp': '46f3b8773ac4d552944a2eb378ba27e8',
+ 'test_image_line.bmp': 'd279707389a3bac62c4413839919b962',
+ 'test_image_line_clip.bmp': 'fe6e5505f60428d47a64124cbb86c68d',
+ 'test_image_pixel.bmp': '1bf9f74b1122d8b3cc4a955c7216feb7',
+ 'test_image_points.png': 'd16cb5b8b309f570940db8c17bccd9a1',
+ 'test_image_points3.png': '984de9e7f1ec017db9c26a19c8e05c14',
+ 'test_image_poly1.bmp': 'd4654eb592716d5fe73c0661b39b39a7',
+ 'test_image_poly2.bmp': '066f46e0363d1c04b002ea1d6716a07f',
+ 'test_image_poly3.bmp': '4fa4411acb4aee16a1c6a2e15df44cc5',
+ 'test_image_polygon_clip.bmp': 'fb8037129941fd6c9e2686f0c109496b',
+ 'test_image_polyline.bmp': '01d7d25972d69796af9fefc67a1e17af',
+ 'test_image_rectangle.bmp': 'f0eff1deadc678b78e26bd1a4cd88810',
+ 'test_image_save.bmp': '1facb71e1f6d0e21abfb8b07ae900a49',
+ 'test_image_save.gif': '50f1d8d494edba646813b7e7ab830e64',
+ 'test_image_save.jpg': 'e6d5a45b093988240cbe3d0365c0675a',
+ 'test_image_save.png': '3067832d58ce76285b7e32d3f42e2659',
+ 'test_image_spline_polygon.png': 'f71ff8d679ed1860a0b032e71a473dc1',
+ 'test_image_spline_polyline.png': 'af9c837b42d5ab88e175416edd7b0ce7',
+ 'test_image_text.bmp': 'a7b1fe64f4da978706d857c39ce5c026',
+ 'test_image_with_colorramp.png': '5089e9a03e0a7c594462d77676341bd8',
+ 'test_image_x_large.png': 'e57caa7c4304f3806eb3f327ff717076',
+ 'test_image_x_lots.png': '4a5d3d96f286b39f795a4422196947bb',
+ 'test_polyline_from_ctrl_points.png': 'cc0ca4db098d7c8e54e0d2bdca0482e9',
+ 'test_smooth_poly.png': '49da823dd438bb9d3ae23781c535f870',
+ 'test_smooth_polyline.png': 'cc0ca4db098d7c8e54e0d2bdca0482e9',
+ 'test_spline_1.png': '3c89b4aa7dfd1eda601d7016925a7b60',
+ 'test_spline_2.png': '16ed4f5f857d57288d23b632e1839fa1',
+ 'test_spline_flat.png': 'bd75cdd52bfdec87648f3a894f8e83b6',
+ 'test_spline_single_ctrl_pt.png': 'f9d3414d24c0a282cb5b5af17c7b12c2',
+ 'test_text_align.bmp': '3151fe59ab1177fe6fde144dedae1082',
+ 'test_text_background.bmp': 'da827b0d1bba63eba680d7328153c82d'}

py_gd/test/test_animation.py

@@ -5,14 +5,16 @@
 designed to be run with pytest:
 """
 
-import hashlib
 from pathlib import Path
+
 import numpy as np
 
 
 from py_gd import Image, Animation  # noqa: F821
 from py_gd.color_ramp import ColorRamp
 
+from .test_gd import check_file
+
 HERE = Path(__file__).parent
 
 
@@ -24,31 +26,31 @@ def outfile(file_name):
     return output_dir / file_name
 
 
-def check_file(name):
-    """
-    checks if the checksum of the passed in filename is the same as it was
-    the last time the checksums were generated...
-    """
-    # checksums of all the images generated.
-    # rebuild with the build_checksums.py script
-    # you may need to do that with a new libjpeg version, for instance
-    #  it would be nice if all images were checked, but only a few are now...
-    checksums = {
-         'test_animation.gif': '3abc5d1963116b1a05701978b048ac8a',
-         'test_animation_reset1.gif': 'a53e5aaebcf441f002927b913c12f213',
-         'test_animation_reset2.gif': 'ec5961189acd876f73f8132707f13c82',
-         'test_animation_reset_same.gif': 'ec5961189acd876f73f8132707f13c82',
-         'test_animation_reuse.gif': 'a45117a3d17f1093d5e395fcc20e69e1',
-         'test_animation_reuse_not_close.gif': '7587576ac36cd0e2e8bcd8ee4ff52b82',
-         'test_animation_static.gif': '4639911d250a50f9a76a24bb23031921',
-        }
-
-    cs = hashlib.md5(open(outfile(name), 'rb').read()).hexdigest()
-    if checksums[name] == cs:
-        return True
-    else:
-        print("Checksum did not match for file:", name)
-        return False
+# def check_file(name):
+#     """
+#     checks if the checksum of the passed in filename is the same as it was
+#     the last time the checksums were generated...
+#     """
+#     # checksums of all the images generated.
+#     # rebuild with the build_checksums.py script
+#     # you may need to do that with a new libjpeg version, for instance
+#     #  it would be nice if all images were checked, but only a few are now...
+#     checksums = {
+#          'test_animation.gif': '3abc5d1963116b1a05701978b048ac8a',
+#          'test_animation_reset1.gif': 'a53e5aaebcf441f002927b913c12f213',
+#          'test_animation_reset2.gif': 'ec5961189acd876f73f8132707f13c82',
+#          'test_animation_reset_same.gif': 'ec5961189acd876f73f8132707f13c82',
+#          'test_animation_reuse.gif': 'a45117a3d17f1093d5e395fcc20e69e1',
+#          'test_animation_reuse_not_close.gif': '7587576ac36cd0e2e8bcd8ee4ff52b82',
+#          'test_animation_static.gif': '4639911d250a50f9a76a24bb23031921',
+#         }
+
+#     cs = hashlib.md5(open(outfile(name), 'rb').read()).hexdigest()
+#     if checksums[name] == cs:
+#         return True
+#     else:
+#         print("Checksum did not match for file:", name)
+#         return False
 
 
 def rotating_line(size=200):
@@ -93,7 +95,6 @@ def test_animation():
     print(f"{anim.frames_written} frames were written")
     assert anim.frames_written == 22
 
-    # should check checksum!
     assert check_file(fname)
 
 
@@ -125,7 +126,8 @@ def test_animation_multi_images_colors():
     # animation.  Otherwise the global palette is assumed and the user must
     # make sure the palettes match.  Use gdImagePaletteCopy to do that.
 
-    anim = Animation(outfile("test_animation_multi_colors.gif"),
+    outfilename = "test_animation_multi_colors.gif"
+    anim = Animation(outfile(outfilename),
                      delay=20,
                      global_colormap=0)
 
@@ -154,7 +156,7 @@ def test_animation_multi_images_colors():
     print(f"{anim.frames_written} frames were written")
     assert anim.frames_written == count
 
-    # should check the checksum
+    assert check_file(outfilename)
 
 
 def test_static_animation():
@@ -186,6 +188,8 @@ def test_static_animation():
     # duplicate images should have added to delay, rather than adding an image
     assert anim.frames_written == 21
 
+    assert check_file("test_animation_static.gif")
+
 
 def test_animation_reuse_filename():
     """
@@ -211,6 +215,8 @@ def test_animation_reuse_filename():
     print(f"{anim.frames_written} frames were written")
     assert anim.frames_written == 21
 
+    assert check_file("test_animation_reuse.gif")
+
 
 def test_animation_reuse_filename_not_close():
     """
@@ -236,6 +242,11 @@ def test_animation_reuse_filename_not_close():
     print(f"{anim.frames_written} frames were written")
     assert anim.frames_written == 21
 
+    # this should run the  __dealloc__
+    del anim
+
+    assert check_file("test_animation_reuse_not_close.gif")
+
 
 def test_animation_reset_new_filename():
     """
@@ -268,6 +279,8 @@ def test_animation_reset_new_filename():
     print(f"{anim.frames_written} frames were written")
     assert anim.frames_written == 21
 
+    assert check_file("test_animation_reset2.gif")
+
 
 def test_animation_reset_same_filename():
     """
@@ -301,6 +314,8 @@ def test_animation_reset_same_filename():
     print(f"{anim.frames_written} frames were written")
     assert anim.frames_written == 21
 
+    assert check_file("test_animation_reset_same.gif")
+
 
 def test_animation_delete_before_use():
     """
@@ -324,10 +339,13 @@ def test_animation_delete_before_use():
     del anim
     assert filename.exists()
 
+    assert check_file("nothing.gif")
+
 
 def test_animation_delete_one_frame():
     """
     make sure the dealloc creates a valid gif with only one frame added
+    (so two frames -- the first and one more added )
     """
     filename = outfile("one_frame_delete.gif")
     anim = Animation(filename)
@@ -338,3 +356,5 @@ def test_animation_delete_one_frame():
     del anim
 
     assert filename.exists()
+
+    assert check_file("one_frame_delete.gif")