matplotlib
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/scatter.pdf
-3.16 KB b/‎lib/matplotlib/tests/baseline_images/test_axes/scatter.pdf
-3.16 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/scatter.png
-7.83 KB b/‎lib/matplotlib/tests/baseline_images/test_axes/scatter.png
-7.83 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/scatter.svg
+190-511 b/‎lib/matplotlib/tests/baseline_images/test_axes/scatter.svg
+190-511
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/scatter_2D.png
96 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/scatter_2D.png
96 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/scatter_marker.png
96 Bytes b/‎lib/matplotlib/tests/baseline_images/test_axes/scatter_marker.png
96 Bytes
diff --git a/‎lib/matplotlib/tests/test_axes.py
+10-7 b/‎lib/matplotlib/tests/test_axes.py
+10-7
diff --git a/‎setup.py
+2-18 b/‎setup.py
+2-18
@@ -1686,16 +1686,16 @@ def test_hist2d_transpose():
 
 
 class TestScatter(object):
-    @image_comparison(baseline_images=['scatter', 'scatter'])
+    @image_comparison(baseline_images=['scatter'],
+                      style='mpl20', remove_text=True)
     def test_scatter_plot(self):
-        fig, ax = plt.subplots()
-        data = {"x": [3, 4, 2, 6], "y": [2, 5, 2, 3],
-                "c": ['r', 'y', 'b', 'lime'], "s": [24, 15, 19, 29]}
-
-        ax.scatter(data["x"], data["y"], c=data["c"], s=data["s"])
+        data = {"x": np.array([3, 4, 2, 6]), "y": np.array([2, 5, 2, 3]),
+                "c": ['r', 'y', 'b', 'lime'], "s": [24, 15, 19, 29],
+                "c2": ['0.5', '0.6', '0.7', '0.8']}
 
-        # Reuse testcase from above for a labeled data test
         fig, ax = plt.subplots()
+        ax.scatter(data["x"] - 1., data["y"] - 1., c=data["c"], s=data["s"])
+        ax.scatter(data["x"] + 1., data["y"] + 1., c=data["c2"], s=data["s"])
         ax.scatter("x", "y", c="c", s="s", data=data)
 
     @image_comparison(baseline_images=['scatter_marker'], remove_text=True,
@@ -1765,6 +1765,9 @@ def test_scatter_color(self):
         ([0.5]*3, None),  # should emit a warning for user's eyes though
         ([0.5]*4, None),  # NB: no warning as matching size allows mapping
         ([0.5]*5, "shape"),
+        # list of strings:
+        (['0.5', '0.4', '0.6', '0.7'], None),
+        (['0.5', 'red', '0.6', 'C5'], None),
         # RGB values
         ([[1, 0, 0]], None),
         ([[1, 0, 0]]*3, "shape"),
 
@@ -15,12 +15,13 @@
     error = """
 Matplotlib 3.0+ does not support Python 2.x, 3.0, 3.1, 3.2, 3.3, or 3.4.
 Beginning with Matplotlib 3.0, Python 3.5 and above is required.
+
 This may be due to an out of date pip.
+
 Make sure you have pip >= 9.0.1.
 """
     sys.exit(error)
 
-import subprocess
 # The setuptools version of sdist adds a setup.cfg file to the tree.
 # We don't want that, so we simply remove it, and it will fall back to
 # vanilla distutils.
@@ -104,27 +105,10 @@ def build_extensions(self):
             self.compiler.compiler_so.remove('-Wstrict-prototypes')
         except (ValueError, AttributeError):
             pass
-        if self._xcode_gte_10():
-            # If compiling using Xcode >= 10, need to manually specify the
-            # -stdlib flag because libstdc++ is no longer available
-            for mod in self.distribution.ext_modules:
-                mod.extra_compile_args = ['-stdlib=libc++']
-                mod.extra_link_args = ['-stdlib=libc++']
         for package in good_packages:
             package.do_custom_build()
         return super().build_extensions()
 
-    def _xcode_gte_10(self):
-        if sys.platform != "darwin":
-            return False
-        # Returns True if compiler is from Xcode version >= 10
-        compiler_version = str(subprocess.check_output(
-            self.compiler.compiler + ['--version'], universal_newlines=True))
-        compiler_version = compiler_version.split(' ')
-        return ((compiler_version[0] == 'Apple') and
-                (compiler_version[1] == 'LLVM') and
-                (int(compiler_version[3].split('.')[0]) >= 10))
-
 
 cmdclass = versioneer.get_cmdclass()
 cmdclass['test'] = NoopTestCommand