More validation and testing changes; WIP

efiring · efiring · commit 9c24406b3d17 · 2020-09-08T09:41:45.000-10:00
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -613,16 +613,8 @@ def __call__(self, X, alpha=None, bytes=False):
         lut.take(xa, axis=0, mode='clip', out=rgba)
 
         if alpha is not None:
-            if not np.iterable(alpha):
-                if alpha < 0 or alpha > 1:
-                    raise ValueError("alpha must be in [0, 1];"
-                                     " found %s" % alpha)
-            else:
+            if np.iterable(alpha):
                 alpha = np.asarray(alpha)
-                if alpha.min() < 0 or alpha.max() > 1:
-                    raise ValueError("alpha must be in [0, 1];"
-                                     " found min %s and max %s" %
-                                     (alpha.min(), alpha.max()))
                 if not (alpha.shape == xa.shape):
                     raise ValueError("alpha is array-like but it's shape"
                                      " %s doesn't match that of X %s" %
diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py
@@ -277,3 +277,29 @@ def test_artist_inspector_get_aliases():
     ai = martist.ArtistInspector(mlines.Line2D)
     aliases = ai.get_aliases()
     assert aliases["linewidth"] == {"lw"}
+
+
+def test_set_alpha():
+    art = martist.Artist()
+    with pytest.raises(TypeError, match='^alpha must be numeric or None'):
+        art.set_alpha('string')
+    with pytest.raises(TypeError, match='^alpha must be numeric or None'):
+        art.set_alpha([1, 2, 3])
+    with pytest.raises(ValueError, match="outside 0-1 range"):
+        art.set_alpha(1.1)
+    with pytest.raises(ValueError, match="outside 0-1 range"):
+        art.set_alpha(np.nan)
+
+
+def test_set_alpha_for_array():
+    art = martist.Artist()
+    with pytest.raises(TypeError, match='^alpha must be numeric or None'):
+        art._set_alpha_for_array('string')
+    with pytest.raises(ValueError, match="outside 0-1 range"):
+        art._set_alpha_for_array(1.1)
+    with pytest.raises(ValueError, match="outside 0-1 range"):
+        art._set_alpha_for_array(np.nan)
+    with pytest.raises(ValueError, match="alpha must be between 0 and 1"):
+        art._set_alpha_for_array([0.5, 1.1])
+    with pytest.raises(ValueError, match="alpha must be between 0 and 1"):
+        art._set_alpha_for_array([0.5, np.nan])
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -714,25 +714,29 @@ def test_quadmesh_alpha_array():
 
 
 def test_alpha_validation():
+    # Most of the relevant testing is in test_artist and test_colors.
     fig, ax = plt.subplots()
     pc = ax.pcolormesh(np.arange(12).reshape((3, 4)))
-    with pytest.raises(TypeError, match='^alpha must be numeric or None'):
-        pc.set_alpha('string')
-    with pytest.raises(ValueError, match="outside 0-1 range"):
-        pc.set_alpha(1.1)
-    with pytest.raises(ValueError, match="outside 0-1 range"):
-        pc.set_alpha(np.nan)
-    with pytest.raises(ValueError, match="alpha must be between 0 and 1"):
-        pc.set_alpha([0.5, 1.1])
-    with pytest.raises(ValueError, match="alpha must be between 0 and 1"):
-        pc.set_alpha([0.5, np.nan])
+    # with pytest.raises(TypeError, match='^alpha must be numeric or None'):
+    #     pc.set_alpha('string')
+    # with pytest.raises(ValueError, match="outside 0-1 range"):
+    #     pc.set_alpha(1.1)
+    # with pytest.raises(ValueError, match="outside 0-1 range"):
+    #     pc.set_alpha(np.nan)
+    # with pytest.raises(ValueError, match="alpha must be between 0 and 1"):
+    #     pc.set_alpha([0.5, 1.1])
+    # with pytest.raises(ValueError, match="alpha must be between 0 and 1"):
+    #     pc.set_alpha([0.5, np.nan])
     with pytest.raises(ValueError, match="^Data array shape"):
         pc.set_alpha([0.5, 0.6])
         pc.update_scalarmappable()
-    ax.cla()
-    sc = ax.scatter([1, 2], [1, 2], color=['r', 'g'])
-    with pytest.raises(ValueError, match="^The number of colors must match"):
-        sc.set_alpha([0.5, 0.5, 0.5])
+    # sc = ax.scatter([1, 2], [1, 2], color=['r', 'g'])
+    # with pytest.raises(ValueError, match="alpha must be between 0 and 1"):
+    #     sc.set_alpha([0.5, 1.1])
+    # with pytest.raises(ValueError, match="outside 0-1 range"):
+    #     sc.set_alpha(1.1)
+    # with pytest.raises(ValueError, match="The number of colors must match"):
+    #     sc.set_alpha([[1, 1, 1]])
 
 
 def test_legend_inverse_size_label_relationship():
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -1072,6 +1072,16 @@ def test_to_rgba_array_single_str():
         array = mcolors.to_rgba_array("rgb")
 
 
+def test_to_rgba_array_alpha_array():
+    with pytest.raises(ValueError, match="The number of colors must match"):
+        mcolors.to_rgba_array(np.ones((5, 3), float), alpha=np.ones((2,)))
+    alpha = [0.5, 0.6]
+    c = mcolors.to_rgba_array(np.ones((2, 3), float), alpha=alpha)
+    assert_array_equal(c[:, 3], alpha)
+    c = mcolors.to_rgba_array(['r', 'g'], alpha=alpha)
+    assert_array_equal(c[:, 3], alpha)
+
+
 def test_failed_conversions():
     with pytest.raises(ValueError):
         mcolors.to_rgba('5')
@@ -1175,3 +1185,12 @@ def test_get_under_over_bad():
     assert_array_equal(cmap.get_under(), cmap(-np.inf))
     assert_array_equal(cmap.get_over(), cmap(np.inf))
     assert_array_equal(cmap.get_bad(), cmap(np.nan))
+
+
+def test_colormap_alpha_array():
+    cmap = plt.get_cmap('viridis')
+    with pytest.raises(ValueError, match="alpha is array-like but"):
+        cmap([1, 2, 3], alpha=[1, 1, 1, 1])
+    alpha = [0.1, 0.2, 0.3]
+    c = cmap([1, 2, 3], alpha=alpha)
+    assert_array_equal(c[:, -1], alpha)
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -1091,6 +1091,11 @@ def test_image_array_alpha(fig_test, fig_ref):
     ax.imshow(rgba, interpolation='nearest')
 
 
+def test_image_array_alpha_validation():
+    with pytest.raises(TypeError, match="alpha must be a float, two-d"):
+        plt.imshow(np.zeros((2, 2)), alpha=[1, 1])
+
+
 @pytest.mark.style('mpl20')
 def test_exact_vmin():
     cmap = copy(plt.cm.get_cmap("autumn_r"))
