matplotlib · jbednar · Mar 1, 2016 · Mar 1, 2016 · Mar 1, 2016 · Mar 2, 2016
diff --git a/INSTALL b/INSTALL
@@ -212,7 +212,11 @@ Required Dependencies
     Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz
 
 :term:`FreeType` 2.3 or later
-    library for reading true type font files.
+    Library for reading true type font files. If using pip, easy_install or 
+    installing from source, the installer will attempt to locate FreeType in
+    expected locations. If it cannot, try installing `pkg-config 
+    <http://matplotlib.org/users/installing.html#optional-dependencies>`__,
+    a tool used to find required non-python libraries.
 
 `cycler <http://matplotlib.org/cycler/>`__ 0.9 or later
    Composable cycle class used for constructing style-cycles
@@ -301,7 +305,7 @@ running::
 
    su -c "yum-builddep python-matplotlib"
 
-This does not build matplotlib, but it does get the install the
+This does not build matplotlib, but it does get and install the
 build dependencies, which will make building from source easier.
 
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -68,7 +68,7 @@ install:
   - cmd: copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat"
 
   # same things as the requirements in ci/conda_recipe/meta.yaml
-  - cmd: conda create -y -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy python-dateutil freetype msinttypes tk pyparsing pytz tornado libpng zlib pyqt cycler nose mock
+  - cmd: conda create -y -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy python-dateutil freetype msinttypes tk pyparsing pytz tornado libpng zlib pyqt cycler nose mock msvc_runtime
   - activate test-environment
   - cmd: echo %PYTHON_VERSION% %TARGET_ARCH%
   - cmd: IF %PYTHON_VERSION% == 2.7 conda install -y functools32

diff --git a/ci/conda_recipe/meta.yaml b/ci/conda_recipe/meta.yaml
@@ -41,6 +41,7 @@ requirements:
     - pyqt                # [not osx]
     - tk                  # [linux and win]
     - functools32         # [py2k]
+    - msvc_runtime        # [win]
 
   run:
     - python
@@ -51,10 +52,11 @@ requirements:
     - pytz
     - pyparsing
 #    - py2cairo            # [linux and py2k]
-    - libpng              # [unix]
+    - libpng
     - pyqt                # [not osx]
     - tk                  # [linux and win]
     - functools32         # [py2k]
+    - msvc_runtime        # [win]
 
 test:
     imports:

diff --git a/doc/_static/ggplot.png b/doc/_static/ggplot.png
diff --git a/doc/_static/holoviews.png b/doc/_static/holoviews.png
diff --git a/doc/_static/seaborn.png b/doc/_static/seaborn.png
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -166,9 +166,13 @@ <h1>Toolkits</h1>
 
 <h1>Third party packages</h1>
 
-<p>A large number of third party <a href="{{ pathto('mpl_toolkits/index') }}">packages</a>
-    extend and build on Matplotlib functionality,
-    including a choice of two projection and mapping toolkits
+<p>A large number of <a href="{{ pathto('thirdpartypackages/index') }}">third party packages</a>
+    extend and build on Matplotlib functionality, including several
+    higher-level plotting interfaces
+    <a href="http://web.stanford.edu/~mwaskom/software/seaborn">seaborn</a>,
+    <a href="http://holoviews.org">holoviews</a>, and
+    <a href="http://ggplot.yhathq.com">ggplot</a>,
+    and a choice of two projection and mapping toolkits
     <a href="http://matplotlib.org/basemap">basemap</a> and
     <a href="http://scitools.org.uk/cartopy/docs/latest">cartopy</a>.
 </p>

diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -161,8 +161,6 @@ <h3>{{ _('Navigation') }}</h3>
 
 {% block relbar1 %}
 
-<link rel="shortcut icon" href="/_static/favicon.ico">
-
 <!-- The "Fork me on github" ribbon -->
 <img style="float: right; margin-bottom: -40px; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" usemap="#ribbonmap"/>
 <map name="ribbonmap">

diff --git a/doc/conf.py b/doc/conf.py
@@ -214,6 +214,8 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Matplotlibdoc'
 
+# Path to favicon
+html_favicon = '_static/favicon.ico'
 
 # Options for LaTeX output
 # ------------------------

diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -246,8 +246,8 @@ You can now install matplotlib and all its dependencies with::
 
     pip install matplotlib
 
-Macports
-^^^^^^^^
+Macports Python
+^^^^^^^^^^^^^^^
 
 For Python 2.7::
 
@@ -259,8 +259,8 @@ For Python 3.4::
     sudo port install py34-pip
     sudo pip-3.4 install matplotlib
 
-Homebrew
-^^^^^^^^
+Homebrew Python
+^^^^^^^^^^^^^^^
 
 For Python 2.7::
 

diff --git a/doc/thirdpartypackages/index.rst b/doc/thirdpartypackages/index.rst
@@ -5,75 +5,104 @@
 *********************
 
 Several external packages that extend or build on Matplotlib functionality
-exist. Below we list a number of these. Please submit an issue or pull request
+exist. Below we list a number of these. Note that they are each
+maintained and distributed separately from Matplotlib, and will need
+to be installed individually.
+
+Please submit an issue or pull request
 on Github if you have created a package that you would like to have included.
 We are also happy to host third party packages within the `Matplotlib Github
 Organization <https://github.com/matplotlib>`_.
 
-.. _toolkits-general:
+.. _hl_plotting:
 
-General Toolkits
-****************
+High-Level Plotting
+*******************
 
+Several projects provide higher-level interfaces for creating
+matplotlib plots.
 
-.. _toolkit_mpldatacursor:
+.. _toolkit_seaborn:
 
-MplDataCursor
-=============
+seaborn
+=======
 
-`MplDataCursor <https://github.com/joferkington/mpldatacursor>`_ is a
-toolkit written by Joe Kington to provide interactive "data cursors"
-(clickable annotation boxes) for matplotlib.
+`seaborn <http://web.stanford.edu/~mwaskom/software/seaborn>`_ is a high
+level interface for drawing statistical graphics with matplotlib. It
+aims to make visualization a central part of exploring and
+understanding complex datasets.
 
+.. image:: /_static/seaborn.png
+    :height: 157px
 
-.. _toolkit_natgrid:
 
-Natgrid
-=======
+.. _toolkit_holoviews:
 
-mpl_toolkits.natgrid is an interface to natgrid C library for gridding
-irregularly spaced data.  This requires a separate installation of the
-`natgrid toolkit <http://github.com/matplotlib/natgrid>`__.
+holoviews
+=========
 
+`holoviews <http://holoviews.org>`_ makes it easier to visualize data
+interactively, especially in a `Jupyter notebook
+<http://jupyter.org>`_, by providing a set of declarative
+plotting objects that store your data and associated metadata.  Your
+data is then immediately visualizable alongside or overlaid with other
+data, either statically or with automatically provided widgets for
+parameter exploration.
 
-.. _toolkit_matplotlibvenn:
+.. image:: /_static/holoviews.png
+    :height: 354px
 
-Matplotlib-Venn
-===============
 
-`Matplotlib-Venn <https://github.com/konstantint/matplotlib-venn>`_ provides a set of functions for plotting 2- and 3-set area-weighted (or unweighted) Venn diagrams.
+.. _toolkit_ggplot:
 
-mplstereonet
-===============
+ggplot
+======
 
-`mplstereonet <https://github.com/joferkington/mplstereonet>`_ provides stereonets for plotting and analyzing orientation data in Matplotlib.
+`ggplot <http://ggplot.yhathq.com>`_ is a port of the R ggplot2
+to python based on matplotlib.
 
+.. image:: /_static/ggplot.png
+    :height: 195px
 
-.. _hl_plotting:
+.. _toolkits-mapping:
 
-High-Level Plotting
-*******************
+Mapping Toolkits
+****************
 
-Several projects have started to provide a higher-level interface to
-matplotlib.  These are independent projects.
+Two independent mapping toolkits are available.
 
-.. _toolkit_seaborn:
+.. _toolkit_basemap:
 
-seaborn
+Basemap
 =======
 
-`seaborn <http://web.stanford.edu/~mwaskom/software/seaborn>`_ is a high
-level interface for drawing statistical graphics with matplotlib. It
-aims to make visualization a central part of exploring and
-understanding complex datasets.
+Plots data on map projections, with continental and political
+boundaries, see `basemap <http://matplotlib.org/basemap>`_
+docs.
 
-.. _toolkit_ggplot:
+.. image:: /_static/basemap_contour1.png
+    :height: 400px
 
-ggplot
-======
 
-`ggplot <https://github.com/yhat/ggplot>`_ is a port of the R ggplot2
-to python based on matplotlib.
+
+Cartopy
+=======
+
+`Cartopy <http://scitools.org.uk/cartopy/docs/latest>`_ builds on top of
+matplotlib to provide object oriented map projection definitions and close
+integration with Shapely for powerful yet easy-to-use vector data processing
+tools. An example plot from the
+`Cartopy gallery <http://scitools.org.uk/cartopy/docs/latest/gallery.html>`_:
+
+.. image:: /_static/cartopy_hurricane_katrina_01_00.png
+    :height: 400px
+
+
+.. _toolkits-misc:
+.. _toolkits-general:
+
+Miscellaneous Toolkits
+**********************
 
 
 .. _toolkit_prettyplotlib:
@@ -107,35 +136,37 @@ feature.
 .. image:: /_static/matplotlib_iterm2_demo.png
 
 
-.. _toolkits-mapping:
+.. _toolkit_mpldatacursor:
 
-Mapping Toolkits
-****************
+MplDataCursor
+=============
 
+`MplDataCursor <https://github.com/joferkington/mpldatacursor>`_ is a
+toolkit written by Joe Kington to provide interactive "data cursors"
+(clickable annotation boxes) for matplotlib.
 
-.. _toolkit_basemap:
 
-Basemap
+.. _toolkit_natgrid:
+
+Natgrid
 =======
 
-Plots data on map projections, with continental and political
-boundaries, see `basemap <http://matplotlib.org/basemap>`_
-docs.
+mpl_toolkits.natgrid is an interface to natgrid C library for gridding
+irregularly spaced data.  This requires a separate installation of the
+`natgrid toolkit <http://github.com/matplotlib/natgrid>`__.
 
-.. image:: /_static/basemap_contour1.png
-    :height: 400px
 
+.. _toolkit_matplotlibvenn:
 
+Matplotlib-Venn
+===============
 
-Cartopy
-=======
+`Matplotlib-Venn <https://github.com/konstantint/matplotlib-venn>`_ provides a set of functions for plotting 2- and 3-set area-weighted (or unweighted) Venn diagrams.
 
-An alternative mapping library written for matplotlib ``v1.2`` and beyond.
-`Cartopy <http://scitools.org.uk/cartopy/docs/latest>`_ builds on top of
-matplotlib to provide object oriented map projection definitions and close
-integration with Shapely for powerful yet easy-to-use vector data processing
-tools. An example plot from the
-`Cartopy gallery <http://scitools.org.uk/cartopy/docs/latest/gallery.html>`_:
 
-.. image:: /_static/cartopy_hurricane_katrina_01_00.png
-    :height: 400px
+.. _toolkit_mplstereonet:
+
+mplstereonet
+===============
+
+`mplstereonet <https://github.com/joferkington/mplstereonet>`_ provides stereonets for plotting and analyzing orientation data in Matplotlib.
diff --git a/examples/pylab_examples/multipage_pdf.py b/examples/pylab_examples/multipage_pdf.py
@@ -18,6 +18,7 @@
     pdf.savefig()  # saves the current figure into a pdf page
     plt.close()
 
+    # if LaTeX is not installed or error caught, change to `usetex=False`
     plt.rc('text', usetex=True)
     plt.figure(figsize=(8, 6))
     x = np.arange(0, 5, 0.1)

diff --git a/examples/user_interfaces/embedding_in_qt5.py b/examples/user_interfaces/embedding_in_qt5.py
@@ -17,7 +17,7 @@
 import matplotlib
 # Make sure that we are using QT5
 matplotlib.use('Qt5Agg')
-from PyQt5 import QtGui, QtCore, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 from numpy import arange, sin, pi
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
@@ -117,8 +117,8 @@ def closeEvent(self, ce):
         self.fileQuit()
 
     def about(self):
-        QtGui.QMessageBox.about(self, "About",
-                                """embedding_in_qt5.py example
+        QtWidgets.QMessageBox.about(self, "About",
+                                    """embedding_in_qt5.py example
 Copyright 2005 Florent Rougon, 2006 Darren Dale, 2015 Jens H Nielsen
 
 This program is a simple example of a Qt5 application embedding matplotlib

diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -342,7 +342,7 @@ def _apply_params(self, **kw):
                 # -> points. grab the integer from the `Text` object
                 # instead of saving the string representation
                 v = getattr(self.label1, 'get_' + k)()
-                setattr(self, '_' + k, v)
+                setattr(self, '_label' + k, v)
 
 
 class XTick(Tick):