scatter() should not rescale if norm is given

timhoffm · timhoffm · commit c61074d2feb5 · 2019-11-24T20:58:54.000+01:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4471,10 +4471,11 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
             collection.set_cmap(cmap)
             collection.set_norm(norm)
 
-            if vmin is not None or vmax is not None:
-                collection.set_clim(vmin, vmax)
-            else:
-                collection.autoscale_None()
+            if norm is None:
+                if vmin is not None or vmax is not None:
+                    collection.set_clim(vmin, vmax)
+                else:
+                    collection.autoscale_None()
 
         # Classic mode only:
         # ensure there are margins to allow for the
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1973,6 +1973,14 @@ def test_scatter_no_invalid_color(self, fig_test, fig_ref):
         ax = fig_ref.subplots()
         ax.scatter([0, 2], [0, 2], c=[1, 2], s=[1, 3], cmap=cmap)
 
+    @check_figures_equal(extensions=["png"])
+    def test_scatter_norm_vminvmax(self, fig_test, fig_ref):
+        x = [1, 2, 3]
+        ax = fig_ref.subplots()
+        ax.scatter(x, x, c=x, norm=mcolors.Normalize(-10, 10))
+        ax = fig_test.subplots()
+        ax.scatter(x, x, c=x, norm=mcolors.Normalize(-10, 10), vmin=0, vmax=5)
+
     @check_figures_equal(extensions=["png"])
     def test_scatter_single_point(self, fig_test, fig_ref):
         ax = fig_test.subplots()
