Merge branch 'v1.4.0-doc' into v1.4.x

 - manually fixed version number

Author: tacaswell

INSTALL

@@ -66,7 +66,7 @@ you will also need to install compatible versions of
 `pyparsing <https://pypi.python.org/pypi/pyparsing/>`_ and
 `six <https://pypi.python.org/pypi/six>`_
 in addition to
-`matplotlib <https://pypi.python.org/pypi/matplotlib>`_.
+`matplotlib <http://matplotlib.org/downloads.html>`_.
 
 In case Python is not installed for all users (not the default), the
 Microsoft Visual C++ 2008 (
@@ -106,14 +106,15 @@ standard Python shell or IPython. It is enabled as the default backend
 for the official binaries.  GTK3 is not supported on Windows.
 
 The Windows installers (:file:`*.exe`) and wheels (:file:`*.whl`) on
-the download page do not contain test data or example code.
+the `download page <http://matplotlib.org/downloads.html>`_ do not
+contain test data or example code.
 If you want to try the many demos that come in the matplotlib source
-distribution, download the zip file and look in the :file:`examples`
-subdirectory.
-To run the test suite, copy the lib\matplotlib\tests and
-lib\mpl_toolkits\tests directories from the source distribution to
-sys.prefix\Lib\site-packages\matplotlib and
-sys.prefix\Lib\site-packages\mpl_toolkits respectively, and install
+distribution, download the :file:`*.tar.gz` file and look in the
+:file:`examples` subdirectory.
+To run the test suite, copy the :file:`lib\matplotlib\tests` and
+:file:`lib\mpl_toolkits\tests` directories from the source distribution to
+:file:`sys.prefix\Lib\site-packages\matplotlib` and
+:file:`sys.prefix\Lib\site-packages\mpl_toolkits` respectively, and install
 `nose <https://pypi.python.org/pypi/nose>`_,
 `mock <https://pypi.python.org/pypi/mock>`_,
 Pillow, MiKTeX, GhostScript, ffmpeg, avconv, mencoder, ImageMagick, and
@@ -239,8 +240,18 @@ Optional dependencies
     selection of image file formats.
 
 
-:term:`freetype` 1.4 (or later)
-    library for reading true type font files.
+:term:`freetype` 2.4 or later
+    library for reading true type font files.  Matplotlib in known
+    to work with freetype 2.3, and the required version will be reduced
+    in 1.4.1.  If you need to build from source on a system which only has
+    freetype 2.3 available, please edit L945 of `setupext.py` to reduce
+    `min_version` to 2.3.
+
+`pytz`
+    Required if you want to manipulate datetime objects which are time-zone
+    aware.  An exception will be raised if you try to make time-zone aware
+    plots with out `pytz` installed.  It will become a required dependency
+    in 1.4.1.
 
 
 Required libraries that ship with matplotlib

doc/_templates/citing.html

@@ -24,4 +24,11 @@ <h1>Citing matplotlib</h1>
   year      = 2007
 }
 </pre>
+
+
+<h2>DOIs</h2>
+<dl>
+  <dt>v1.4.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.11451"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.11451.png" alt="10.5281/zenodo.11451"></a></dd>
+</dl>
+
 {% endblock %}

doc/_templates/layout.html

@@ -178,25 +178,6 @@ <h3>{{ _('Navigation') }}</h3>
 
 {% block relbar1 %}
 
-<!-- Piwik -->
-<script type="text/javascript">
-if ("matplotlib.sourceforge.net" == document.location.hostname ||
-    "matplotlib.sf.net" == document.location.hostname) {
-  var pkBaseURL = (("https:" == document.location.protocol) ? "https://apps.sourceforge.net/piwik/matplotlib/" : "http://apps.sourceforge.net/piwik/matplotlib/");
-  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-}
-</script>
-<script type="text/javascript">
-if ("matplotlib.sourceforge.net" == document.location.hostname ||
-    "matplotlib.sf.net" == document.location.hostname) {
-  piwik_action_name = '';
-  piwik_idsite = 1;
-  piwik_url = pkBaseURL + "piwik.php";
-  piwik_log(piwik_action_name, piwik_idsite, piwik_url);
-  document.write(unescape('%3Cobject%3E%3Cnoscript%3E%3Cp%3E%3Cimg src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/%3E%3C/p%3E%3C/noscript%3E%3C/object%3E'));
-}
-</script>
-<!-- End Piwik Tag -->
 <link rel="shortcut icon" href="/_static/favicon.ico">
 
 <!-- The "Fork me on github" ribbon -->

doc/users/plotting/colormaps/Lfunction.py

@@ -1,16 +1,14 @@
 '''
-Recreate Josef Albers plot illustrating the Weber-Fechner law and illustrate 
-with the binary matplotlib colormap, too. Trying to show the difference between 
+Recreate Josef Albers plot illustrating the Weber-Fechner law and illustrate
+with the binary matplotlib colormap, too. Trying to show the difference between
 adding blackness to a color at different rates.
 '''
 
 import numpy as np
 import matplotlib.pyplot as plt
-from skimage import io, color
-import pdb
+from skimage import color
 import matplotlib as mpl
-from mpl_toolkits.mplot3d import Axes3D
-from matplotlib import cm, colors
+from matplotlib import cm
 
 
 mpl.rcParams.update({'font.size': 20})
@@ -90,7 +88,7 @@
 
 
 # common ylabel
-ax1.text(-0.3, 3.8, 'Additional Parts Black', 
+ax1.text(-0.3, 3.8, 'Additional Parts Black',
             rotation=90, transform=ax1.transAxes)
 
 
@@ -164,7 +162,7 @@
     ax2.spines['left'].set_visible(False)
 
 # common ylabel
-ax1.text(-0.3, 4.0, 'Steps through map indices', 
+ax1.text(-0.3, 4.0, 'Steps through map indices',
             rotation=90, transform=ax1.transAxes)
 
 fig.subplots_adjust(hspace=0.0)

doc/users/plotting/colormaps/grayscale.py

@@ -3,13 +3,11 @@
 Uses lightness L* as a proxy for grayscale value.
 '''
 
-from skimage import io, color
+from skimage import color
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib import cm
 import matplotlib as mpl
-import pdb
-from scipy.optimize import curve_fit
 
 mpl.rcParams.update({'font.size': 14})
 mpl.rcParams['font.sans-serif'] = 'Arev Sans, Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Helvetica, Avant Garde, sans-serif'
@@ -40,7 +38,7 @@
                              'gnuplot', 'gnuplot2', 'ocean', 'rainbow',
                              'terrain', 'flag', 'prism'])]
 
-# indices to step through colormap        
+# indices to step through colormap
 x = np.linspace(0.0, 1.0, 100)
 
 nrows = max(len(cmap_list) for cmap_category, cmap_list in cmaps)
@@ -78,4 +76,3 @@ def plot_color_gradients(cmap_category, cmap_list):
 for cmap_category, cmap_list in cmaps:
 
     plot_color_gradients(cmap_category, cmap_list)
-

doc/users/plotting/colormaps/lightness.py

@@ -2,13 +2,11 @@
 For each colormap, plot the lightness parameter L* from CIELAB colorspace along the y axis vs index through the colormap. Colormaps are examined in categories as in the original matplotlib gallery of colormaps.
 '''
 
-from skimage import io, color
+from skimage import color
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib import cm
 import matplotlib as mpl
-import pdb
-from scipy.optimize import curve_fit
 
 mpl.rcParams.update({'font.size': 14})
 mpl.rcParams['font.sans-serif'] = 'Arev Sans, Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Helvetica, Avant Garde, sans-serif'
@@ -39,7 +37,7 @@
                              'gnuplot', 'gnuplot2', 'ocean', 'rainbow',
                              'terrain', 'flag', 'prism'])]
 
-# indices to step through colormap        
+# indices to step through colormap
 x = np.linspace(0.0, 1.0, 100)
 
 # Do plot
@@ -49,9 +47,9 @@
     dsub = 5 # number of colormaps per subplot
     if cmap_category == 'Diverging': # because has 13 colormaps
         dsub = 6
-    elif cmap_category == 'Sequential2': 
+    elif cmap_category == 'Sequential2':
         dsub = 7
-    elif cmap_category == 'Sequential': 
+    elif cmap_category == 'Sequential':
         dsub = 7
     nsubplots = int(np.ceil(len(cmap_list)/float(dsub)))
 
@@ -63,7 +61,7 @@
 
         ax = fig.add_subplot(nsubplots, 1, i+1)
         # pdb.set_trace()
-        
+
         for j, cmap in enumerate(cmap_list[i*dsub:(i+1)*dsub]):
 
             # Get rgb values for colormap
@@ -113,7 +111,7 @@
                 ax.scatter(x+j*dc, lab[0,:,0], c=x, cmap=cmap, s=300, linewidths=0.)
                 ax.axis([-0.1,6.1,0,100])
                 locs.append(x[int(x.size/2.)]+j*dc) # store locations for colormap labels
-        
+
             # Set up labels for colormaps
             ax.xaxis.set_ticks_position('top')
             ticker = mpl.ticker.FixedLocator(locs)

doc/users/whats_new.rst

@@ -38,7 +38,7 @@ activity, but this can be problematic for the red/green colorblind. A new,
 colorblind-friendly colormap is now available at :class:`matplotlib.cm.Wistia`.
 This colormap maintains the red/green symbolism while achieving deuteranopic
 legibility through brightness variations. See
-`here <https://github.com/wistia/heatmap-palette>`
+`here <https://github.com/wistia/heatmap-palette>`_
 for more information.
 
 Documentation changes
@@ -70,20 +70,20 @@ containing the positions for each element of the boxplots. Then
 a second method, :func:`~matplotlib.Axes.bxp` is called to draw the boxplots
 based on the stats.
 
-The :func:~matplotlib.pyplot.boxplot function can be used as before to
+The :func:`~matplotlib.pyplot.boxplot` function can be used as before to
 generate boxplots from data in one step. But now the user has the
 flexibility to generate the statistics independently, or to modify the
-output of :func:~matplotlib.cbook.boxplot_stats prior to plotting
-with :func:~matplotlib.Axes.bxp.
+output of :func:`~matplotlib.cbook.boxplot_stats` prior to plotting
+with :func:`~matplotlib.Axes.bxp`.
 
 Lastly, each artist (e.g., the box, outliers, cap, notches) can now be
 toggled on or off and their styles can be passed in through individual
 kwargs. See the examples:
-:ref:`~examples/statistics/boxplot_demo.py` and
-:ref:`~examples/statistics/bxp_demo.py`
+:ref:`statistics-boxplot_demo` and
+:ref:`statistics-bxp_demo`
 
-Added a bool kwarg, `manage_xticks`, which if False disables the management
-of the xtick and xlim by `boxplot`.
+Added a bool kwarg, :code:`manage_xticks`, which if False disables the management
+of the ticks and limits on the x-axis by :func:`~matplotlib.axes.Axes.bxp`.
 
 Support for datetime axes in 2d plots
 `````````````````````````````````````
@@ -317,6 +317,14 @@ Backwards compatibility for Qt4 is maintained by wrapping the Qt5 implementation
 
 The Qt5Agg backend currently does not work with IPython's %matplotlib magic.
 
+The 1.4.0 release has a known bug where the toolbar is broken.  This can be
+fixed by: ::
+
+   cd path/to/installed/matplotlib
+   wget https://github.com/matplotlib/matplotlib/pull/3322.diff
+   # unix2dos 3322.diff (if on windows to fix line endings)
+   patch -p2 < 3322.diff
+
 Qt4 backend
 ```````````
 Rudolf Höfler changed the appearance of the subplottool. All sliders are

lib/matplotlib/__init__.py

@@ -106,7 +106,7 @@
 import sys
 import distutils.version
 
-__version__  = '1.4.0'
+__version__  = '1.4.x'
 __version__numpy__ = '1.6' # minimum required numpy version
 
 try: