Merge branch 'master' of git://github.com/matplotlib/matplotlib into fixForIssue4977MacOSX

Get the PDF versions of the icons.

Author: mdehoon

.travis.yml

@@ -43,10 +43,8 @@ matrix:
       env: TEST_ARGS=--pep8
     - python: 2.7
       env: BUILD_DOCS=true MOCK=mock
-    - python: "3.5.0b4"
+    - python: "3.5.0rc2"
       env: PRE=--pre
-  allow_failures:
-    - python : "3.5.0b4"
 
 before_install:
   - source tools/travis_tools.sh

INSTALL

@@ -135,6 +135,14 @@ the latest *tar.gz* release file from `the download page
 to develop matplotlib or just need the latest bugfixed version, grab
 the latest git version :ref:`install-from-git`.
 
+The standard environment variables `CC`, `CXX`, `PKG_CONFIG` are respected.
+This means you can set them if your toolchain is prefixed. This may be used for
+cross compiling.
+
+  export CC=x86_64-pc-linux-gnu-gcc
+  export CXX=x86_64-pc-linux-gnu-g++
+  export PKG_CONFIG=x86_64-pc-linux-gnu-pkg-config
+
 Once you have satisfied the requirements detailed below (mainly
 python, numpy, libpng and freetype), you can build matplotlib::
 

doc/api/api_changes/2015-08-17-remove_color_cycle.rst

@@ -0,0 +1,17 @@
+`color_cycle` deprecated
+````````````````````````
+
+In light of the new property cycling feature,
+the Axes method *set_color_cycle* is now deprecated.
+Calling this method will replace the current property cycle with
+one that cycles just the given colors.
+
+Similarly, the rc parameter *axes.color_cycle* is also deprecated in
+lieu of the new *axes.prop_cycle* parameter. Having both parameters in
+the same rc file is not recommended as the result cannot be
+predicted. For compatibility, setting *axes.color_cycle* will
+replace the cycler in *axes.prop_cycle* with a color cycle.
+Accessing *axes.color_cycle* will return just the color portion
+of the property cycle, if it exists.
+
+Timeline for removal has not been set.

doc/api/api_changes/2015-08-29-custom-axes-view.rst

@@ -0,0 +1,12 @@
+New API for custom Axes view changes
+````````````````````````````````````
+
+Interactive pan and zoom were previously implemented using a Cartesian-specific
+algorithm that was not necessarily applicable to custom Axes. Three new private
+methods, :meth:`~matplotlib.axes._base._AxesBase._get_view`,
+:meth:`~matplotlib.axes._base._AxesBase._set_view`, and
+:meth:`~matplotlib.axes._base._AxesBase._set_view_from_bbox`, allow for custom
+``Axes`` classes to override the pan and zoom algorithms. Implementors of
+custom ``Axes`` who override these methods may provide suitable behaviour for
+both pan and zoom as well as the view navigation buttons on the interactive
+toolbars. 

doc/users/whats_new.rst

@@ -98,6 +98,16 @@ IPython's ``HTML`` display class::
     from IPython.display import HTML
     HTML(anim.to_html5_video())
 
+Prefixed pkg-config for building
+--------------------------------
+
+Handling of `pkg-config` has been fixed in so far as it is now possible to set
+it using the environment variable `PKG_CONFIG`. This is important if your
+toolchain is prefixed. This is done in a simpilar way as setting `CC` or `CXX`
+before building. An example follows.
+
+    export PKG_CONFIG=x86_64-pc-linux-gnu-pkg-config
+
 
 .. _whats-new-1-4:
 

doc/users/whats_new/rcparams.rst

@@ -1,3 +1,19 @@
+Added ``axes.prop_cycle`` key to rcParams
+`````````````````````````````````````````
+This is a more generic form of the now-deprecated ``axes.color_cycle`` param.
+Now, we can cycle more than just colors, but also linestyles, hatches,
+and just about any other artist property. Cycler notation is used for
+defining proprty cycles. Adding cyclers together will be like you are
+`zip()`-ing together two or more property cycles together::
+
+    axes.prop_cycle: cycler('color', 'rgb') + cycler('lw', [1, 2, 3])
+
+You can even multiply cyclers, which is like using `itertools.product()`
+on two or more property cycles. Remember to use parentheses if writing
+a multi-line `prop_cycle` parameter.
+
+..plot:: mpl_examples/color/color_cycle_demo.py
+
 Added ``errorbar.capsize`` key to rcParams
 ``````````````````````````````````````````
 Controls the length of end caps on error bars. If set to zero, errorbars
@@ -45,7 +61,9 @@ default), ``'left'``, ``'right'``, ``'bottom'``, ``'top'`` and ``'none'``.
 Added "toolmanager" to "toolbar" possible values
 ````````````````````````````````````````````````
 
-The new value enables the use of ``ToolManager``
+The new value enables the use of ``ToolManager``.  Note at the moment we
+release this for feedback and should get treated as experimental until further
+notice.
 
 
 Added ``axes.labelpad``

doc/users/whats_new/toolmanager.rst

@@ -12,8 +12,10 @@ The `Toolbars` are replaced for `ToolContainers` that are just GUI interfaces to
 
 
 .. note::
-	For the moment the `ToolManager` is working only with `GTK3` and `Tk` backends.
-	Make sure you are using one of those.
+    At the moment we release this primarily for feedback purposes and should
+    get treated as experimental until further notice as API changes will occur.
+	For the moment the `ToolManager` works only with the `GTK3` and `Tk` backends.
+	Make sure you use one of those.
 	Port for the rest of the backends is comming soon.
 
 	To activate the `ToolManager` include the following at the top of your file:

doc/users/whats_new/updated_widgets.rst

@@ -11,3 +11,16 @@ A MultiCursor object can be disabled (and enabled) after it has been created wit
 Example::
 
   multi_cursor.active = False
+
+
+Improved RectangleSelector and new EllipseSelector Widget
+`````````````````````````````````````````````````````````
+
+Adds an `interactive` keyword which enables visible handles for manipulating the shape after it has been drawn.
+
+Adds keyboard modifiers for:
+
+- Moving the existing shape (default key = 'space')
+- Making the shape square (default 'shift')
+- Make the initial point the center of the shape (default 'control')
+- Square and center can be combined

examples/animation/dynamic_image.py

@@ -15,7 +15,7 @@ def f(x, y):
 x = np.linspace(0, 2 * np.pi, 120)
 y = np.linspace(0, 2 * np.pi, 100).reshape(-1, 1)
 
-im = plt.imshow(f(x, y), cmap=plt.get_cmap('jet'))
+im = plt.imshow(f(x, y), cmap=plt.get_cmap('viridis'), animated=True)
 
 
 def updatefig(*args):

examples/animation/dynamic_image2.py

@@ -21,7 +21,7 @@ def f(x, y):
 for i in range(60):
     x += np.pi / 15.
     y += np.pi / 20.
-    im = plt.imshow(f(x, y))
+    im = plt.imshow(f(x, y), cmap='viridis', animated=True)
     ims.append([im])
 
 ani = animation.ArtistAnimation(fig, ims, interval=50, blit=True,