Include distribute_setup.py in the tarball

Author: mdboom

MANIFEST.in

@@ -2,7 +2,7 @@ include CHANGELOG INSTALL
 include INTERACTIVE TODO CONTRIBUTING.md
 include Makefile MANIFEST.in MANIFEST
 include matplotlibrc.template setup.cfg.template
-include setupext.py setup.py setupegg.py
+include setupext.py setup.py setupegg.py distribute_setup.py
 include lib/matplotlib/mpl-data/lineprops.glade
 include lib/matplotlib/mpl-data/matplotlibrc
 include lib/matplotlib/mpl-data/images/*

lib/matplotlib/tests/test_colors.py

@@ -122,7 +122,7 @@ def test_cmap_and_norm_from_levels_and_colors2():
     clr = mcolors.colorConverter.to_rgba_array(colors)
     bad = (0.1, 0.1, 0.1, 0.1)
     no_color = (0.0, 0.0, 0.0, 0.0)
-    masked_value = 'masked value'
+    masked_value = np.inf
 
     # Define the test values which are of interest.
     # Note: levels are lev[i] <= v < lev[i+1]