Update to match master

Author: adamtheturtle

dev-requirements.txt

@@ -1,5 +1,6 @@
 attrs==18.1.0  # Modern attrs is required for pytest
-autoflake==1.2check-manifest==0.37
+autoflake==1.2
+check-manifest==0.37
 codecov==2.0.15 # Upload coverage data
 dodgy==0.1.9  # Look for uploaded secrets
 flake8==3.5.0  # Lint

tests/mock_vws/test_query.py

@@ -25,7 +25,7 @@
     add_target_to_vws,
     delete_target,
     get_vws_target,
-    image_file,
+    make_image_file,
     query,
     update_target,
     wait_for_target_processed,
@@ -1083,7 +1083,7 @@ def test_png(
         """
         documented_max_bytes = 2 * 1024 * 1024
         width = height = 835
-        png_not_too_large = image_file(
+        png_not_too_large = make_image_file(
             file_format='PNG',
             color_space='RGB',
             width=width,
@@ -1110,7 +1110,7 @@ def test_png(
         assert response.json()['results'] == []
 
         width = height = 836
-        png_not_too_large = image_file(
+        png_not_too_large = make_image_file(
             file_format='PNG',
             color_space='RGB',
             width=width,