Merge remote-tracking branch 'origin/master' into max-image-size-png

Author: adamtheturtle

dev-requirements.txt

@@ -6,7 +6,7 @@ flake8==3.5.0  # Lint
 flake8-commas==2.0.0  # Require silicon valley commas
 flake8-quotes==1.0.0  # Require single quotes
 freezegun==0.3.10  # Freeze time in tests
-hypothesis==3.59.0  # Generate test cases
+hypothesis==3.59.1  # Generate test cases
 isort==4.3.4  # Lint imports
 mypy==0.610  # Type checking
 pip_check_reqs==2.0.3

tests/mock_vws/fixtures/images.py

@@ -7,7 +7,7 @@
 import pytest
 from _pytest.fixtures import SubRequest
 
-from tests.mock_vws.utils import image_file
+from tests.mock_vws.utils import make_image_file
 
 
 @pytest.fixture
@@ -16,23 +16,38 @@ def png_rgb_success() -> io.BytesIO:
     Return a PNG file in the RGB color space which is expected to have a
     'success' status when added to a target.
     """
-    return image_file(file_format='PNG', color_space='RGB', width=5, height=5)
+    return make_image_file(
+        file_format='PNG',
+        color_space='RGB',
+        width=5,
+        height=5,
+    )
 
 
 @pytest.fixture
 def png_rgb() -> io.BytesIO:
     """
     Return a 1x1 PNG file in the RGB color space.
     """
-    return image_file(file_format='PNG', color_space='RGB', width=1, height=1)
+    return make_image_file(
+        file_format='PNG',
+        color_space='RGB',
+        width=1,
+        height=1,
+    )
 
 
 @pytest.fixture
 def png_greyscale() -> io.BytesIO:
     """
     Return a 1x1 PNG file in the greyscale color space.
     """
-    return image_file(file_format='PNG', color_space='L', width=1, height=1)
+    return make_image_file(
+        file_format='PNG',
+        color_space='L',
+        width=1,
+        height=1,
+    )
 
 
 @pytest.fixture()
@@ -62,7 +77,7 @@ def jpeg_cmyk() -> io.BytesIO:
     """
     Return a 1x1 JPEG file in the CMYK color space.
     """
-    return image_file(
+    return make_image_file(
         file_format='JPEG',
         color_space='CMYK',
         width=1,
@@ -75,7 +90,7 @@ def jpeg_rgb() -> io.BytesIO:
     """
     Return a 1x1 JPEG file in the RGB color space.
     """
-    return image_file(
+    return make_image_file(
         file_format='JPEG',
         color_space='RGB',
         width=1,
@@ -91,7 +106,7 @@ def tiff_rgb() -> io.BytesIO:
     This is given as an option which is not supported by Vuforia as Vuforia
     supports only JPEG and PNG files.
     """
-    return image_file(
+    return make_image_file(
         file_format='TIFF',
         color_space='RGB',
         width=1,

tests/mock_vws/utils/__init__.py

@@ -422,7 +422,7 @@ def query(
     return response
 
 
-def image_file(
+def make_image_file(
     file_format: str,
     color_space: str,
     width: int,