Merge pull request #13 from pimoroni/patch-np-array

Tidy up numpy image handling and fix tests

library/ST7789/__init__.py

@@ -341,11 +341,10 @@ def image_to_data(self, image, rotation=0):
         """Generator function to convert a PIL image to 16-bit 565 RGB bytes."""
         # NumPy is much faster at doing this. NumPy code provided by:
         # Keith (https://www.blogger.com/profile/02555547344016007163)
-        if type(image) == np.ndarray:
-            pb = np.rot90(image, rotation // 90).astype('uint8')
-        else:
-            pb = np.rot90(np.array(image.convert('RGB')), rotation // 90).astype('uint8')
+        if not isinstance(image, np.ndarray):
+            image = np.array(image.convert('RGB'))
 
+        pb = np.rot90(image, rotation // 90).astype('uint8')
 
         result = np.zeros((self._width, self._height, 2), dtype=np.uint8)
         result[..., [0]] = np.add(np.bitwise_and(pb[..., [0]], 0xF8), np.right_shift(pb[..., [1]], 5))

library/tests/conftest.py

@@ -25,14 +25,3 @@ def spidev():
     sys.modules['spidev'] = spidev
     yield spidev
     del sys.modules['spidev']
-
-
-@pytest.fixture(scope='function', autouse=False)
-def numpy():
-    """Mock numpy module."""
-
-    numpy = mock.MagicMock()
-
-    sys.modules['numpy'] = numpy
-    yield numpy
-    del sys.modules['numpy']

library/tests/test_dimensions.py

@@ -1,4 +1,4 @@
-def test_240_240(GPIO, spidev, numpy):
+def test_240_240(GPIO, spidev):
     import ST7789
     display = ST7789.ST7789(port=0, cs=0, dc=24, width=240, height=240, rotation=0)
     assert display.width == 240

library/tests/test_display.py

@@ -15,6 +15,4 @@ def test_display_numpy_array(GPIO, spidev):
     display = ST7789.ST7789(port=0, cs=0, dc=24)
 
     image = numpy.empty((display.width, display.height, 3))
-
-    with pytest.raises(AttributeError):
-        display.display(image)
+    display.display(image)

library/tests/test_setup.py

@@ -1,4 +1,4 @@
-def test_setup(GPIO, spidev, numpy):
+def test_setup(GPIO, spidev):
     import ST7789
     display = ST7789.ST7789(port=0, cs=0, dc=24)
     del display