Merge 1fe7ba5 into 4d70eab

appveyor.yml

@@ -49,7 +49,7 @@ install:
 
   # Inspect contents and set env vars
   - dir "%IMAGE_MAGICK_INSTALL_DIR%"
-  - set IMAGEMAGICK_BINARY=%IMAGE_MAGICK_INSTALL_DIR%//convert.exe
+  - set IMAGEMAGICK_BINARY=%IMAGE_MAGICK_INSTALL_DIR%//magick.exe
   - echo %IMAGEMAGICK_BINARY%
   - set FMPEG_BINARY="%IMAGE_MAGICK_INSTALL_DIR%//ffmpeg.exe"
   - echo %FMPEG_BINARY%

find_latest_imagemagick_version.py

@@ -1,21 +1,21 @@
 import re
 from urllib import request
 
-url = "https://legacy.imagemagick.org/script/index.php"
+url = "https://imagemagick.org/script/index.php"
 
 """This little script parses url above to extract latest image magick version
-(major version 6.9), to feed it into CI system. Not the best way for reproducible
+(major version 7.0), to feed it into CI system. Not the best way for reproducible
 builds, but it's preferred for now over storing imagemagick installer into the
 git repository
 """
 
 response = request.urlopen(url)
 html = response.read().decode(r"utf-8")
-r = re.compile(r"6\.9\.[0-9]+-[0-9]+")
+r = re.compile(r"7\.0\.[0-9]+-[0-9]+")
 version = r.findall(html)
 if len(version) == 0:
     raise ValueError(
-        "Could not find latest legacy 6.9.X-Y ImageMagick version from {}".format(url)
+        "Could not find latest 7.0.X-Y ImageMagick version from {}".format(url)
     )
 version = version[0]
 # Append Q16 build