Merge branch 'master' of github.com:matplotlib/matplotlib

* 'master' of github.com:matplotlib/matplotlib: (90 commits)
  added information regarding new spectrum functions to CHANGELOG, whats_new, and api_changes
  add demo for new spectral plot types
  add tests for new spectrum types in _axes
  add more spectral plots and add new spectrum types to specgram in _axes
  implement tests for refactored mlab spectrum, windowing, and detrend functions, with 100% coverage
  refactor mlab spectrum, window, and detrend functions to improve modularity, testability, and performance
  add CleanupTestCase, a unittest.TestCase with cleanup
  add mlab tests for new spectrum types, window and detrend functions, and greatly expand existing tests
  add more spectrum functions and add new spectrum types to specgram in mlab.py, and clean up window and detrend functions in mlab.py
  Fix for compiling ttconv in extern directory
  cast argv to unicode before testing
  Move external libraries to 'extern' directory
  Minor doc fixes
  Fix encoding issues when font name contains non-ascii characters
  Fix writing to all manner of StringIO-like objects in PS backend.
  add new ps backend test file in `__init__.py`
  BUG: Fixed object type missmatch in SymLogNorm
  add failing test: savefig(StringIO(), format="ps")
  Adding a missing 'b' back into two 'bbox_' kwargs
  Fix build
  ...

Author: pelson

.gitignore

@@ -54,3 +54,9 @@ doc/_templates/gallery.html
 doc/users/installing.rst
 doc/_static/matplotlibrc
 lib/dateutil
+examples/*/*.pdf
+examples/*/*.png
+examples/tests/*
+!examples/tests/backend_driver.py
+texput.log
+result_images

.travis.yml

@@ -17,8 +17,7 @@ python:
   - 3.3
 
 install:
-  - pip install -q --use-mirrors nose python-dateutil numpy pep8 pyparsing
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip -q install --use-mirrors PIL; fi
+  - pip install -q --use-mirrors nose python-dateutil numpy pep8 pyparsing pillow
   - sudo apt-get update && sudo apt-get -qq install inkscape
   - python setup.py install
 
@@ -35,5 +34,6 @@ script:
   - python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300
 
 after_failure:
-  - cd ../matplotlib
-  - ./travis_upload.sh
+  - tar cjf result_images.tar.bz2 result_images
+  - travis-artifacts upload --path result_images.tar.bz2
+  - echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2

CHANGELOG

@@ -1,3 +1,19 @@
+2013-10-06 Add stride-based functions to mlab for easy creation of 2D arrays
+           with less memory.
+
+2013-10-06 Improve window and detrend functions in mlab, particulart support for
+           2D arrays.
+
+2013-10-06 Improve performance of all spectrum-related mlab functions and plots.
+
+2013-10-06 Added support for magnitude, phase, and angle spectrums to
+           axes.specgram, and support for magnitude, phase, angle, and complex
+           spectrums to mlab-specgram.
+
+2013-10-06 Added magnitude_spectrum, angle_spectrum, and phase_spectrum plots,
+           as well as magnitude_spectrum, angle_spectrum, phase_spectrum,
+           and complex_spectrum functions to mlab
+
 2013-07-12 Added support for datetime axes to 2d plots. Axis values are passed
            through Axes.convert_xunits/Axes.convert_yunits before being used by
            contour/contourf, pcolormesh and pcolor.

boilerplate.py

@@ -16,7 +16,8 @@
 # For some later history, see
 # http://thread.gmane.org/gmane.comp.python.matplotlib.devel/7068
 
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 import six
 
@@ -97,6 +98,7 @@ def boilerplate_gen():
     # name.
     _plotcommands = (
         'acorr',
+        'angle_spectrum',
         'arrow',
         'axhline',
         'axhspan',
@@ -122,8 +124,10 @@ def boilerplate_gen():
         'hlines',
         'imshow',
         'loglog',
+        'magnitude_spectrum',
         'pcolor',
         'pcolormesh',
+        'phase_spectrum',
         'pie',
         'plot',
         'plot_date',

doc/api/api_changes.rst

@@ -76,13 +76,49 @@ original location:
     - `xycoords` -> set the units of the point location
     - `set_position()` -> `Annotation` only set location of annotation
 
+* NFFT being even is now enforced in `matplotlib.mlab.specgram`,
+  `matplotlib.mlab.psd`,  `matplotlib.mlab.csd`,
+  `matplotlib.mlab.cohere`, `matplotlib.mlab.cohere_pairs`,
+  `matplotlib.pyplot.specgram`, `matplotlib.pyplot.psd`,
+  `matplotlib.pyplot.csd`, and `matplotlib.pyplot.cohere`.  This was
+  listed as a requirement but was not actually checked.
+
+* `matplotlib.mlab.specgram`, `matplotlib.mlab.psd`,  `matplotlib.mlab.csd`,
+  `matplotlib.mlab.cohere`, `matplotlib.mlab.cohere_pairs`,
+  `matplotlib.pyplot.specgram`, `matplotlib.pyplot.psd`,
+  `matplotlib.pyplot.csd`, and `matplotlib.pyplot.cohere` now raise
+  ValueError where they previously raised AssertionError.
+
+* For `matplotlib.mlab.psd`,  `matplotlib.mlab.csd`,
+  `matplotlib.mlab.cohere`, `matplotlib.mlab.cohere_pairs`,
+  `matplotlib.pyplot.specgram`, `matplotlib.pyplot.psd`,
+  `matplotlib.pyplot.csd`, and `matplotlib.pyplot.cohere`, in cases
+  where a shape (n, 1) array is returned, this is now converted to a (n, )
+  array.  Previously, (n, m) arrays were averaged to an (n, ) array, but
+  (n, 1) arrays were returend unchanged.  This change makes the dimensions
+  consistent in both cases.
+
 
 .. _changes_in_1_3:
 
 
 Changes in 1.3.x
 ================
 
+Changes in 1.3.1
+----------------
+
+It is rare that we make an API change in a bugfix release, however,
+for 1.3.1 since 1.3.0 the following change was made:
+
+- `text.Text.cached` (used to cache font objects) has been made into a
+  private variable.  Among the obvious encapsulation benefit, this
+  removes this confusing-looking member from the documentation.
+
+- The method :meth:`~matplotlib.axes.Axes.hist` now always returns bin
+  occupancies as an array of type `float`. Previously, it was sometimes
+  an array of type `int`, depending on the call.
+
 Code removal
 ------------
 
@@ -263,10 +299,6 @@ Code changes
 * The :func:`matplotlib.cbook.check_output` function has been moved to
   :func:`matplotlib.compat.subprocess`.
 
-* The method :meth:`~matplotlib.axes.Axes.hist` now always returns bin
-  occupancies as an array of type `float`. Previously, it was sometimes
-  an array of type `int`, depending on the call.
-
 Configuration and rcParams
 --------------------------
 

doc/users/plotting/examples/pgf_preamble.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 import six
 

doc/users/whats_new.rst

@@ -32,6 +32,36 @@ Andrew Dawson added support for datetime axes to
 :func:`~matplotlib.pyplot.contour`, :func:`~matplotlib.pyplot.contourf`, 
 :func:`~matplotlib.pyplot.pcolormesh` and :func:`~matplotlib.pyplot.pcolor`. 
 
+Support for additional spectrum types
+`````````````````````````````````````
+Todd Jennings added support for new types of frequency spectrum plots:
+:func:`~matplotlib.pyplot.magnitude_spectrum`,
+:func:`~matplotlib.pyplot.phase_spectrum`, and
+:func:`~matplotlib.pyplot.angle_spectrum`, as well as corresponding functions
+in mlab.
+
+He also added these spectrum types to :func:`~matplotlib.pyplot.specgram`,
+as well as adding support for linear scaling there (in addition to the
+existing dB scaling). Support for additional spectrum types was also added to
+:func:`~matplotlib.mlab.specgram`.
+
+He also increased the performance for all of these functions and plot types.
+
+Support for detrending and windowing 2D arrays in mlab
+``````````````````````````````````````````````````````
+Todd Jennings added support for 2D arrays in the 
+:func:`~matplotlib.mlab.detrend_mean`, :func:`~matplotlib.mlab.detrend_none`,
+and :func:`~matplotlib.mlab.detrend`, as well as adding 
+:func:`~matplotlib.mlab.apply_window` which support windowing 2D arrays.
+
+Support for strides in mlab
+```````````````````````````
+Todd Jennings added some functions to mlab to make it easier to use numpy
+strides to create memory-efficient 2D arrays.  This includes
+:func:`~matplotlib.mlab.stride_repeat`, which repeats an array to create a 2D
+array, and :func:`~matplotlib.mlab.stride_windows`, which uses a moving window
+to create a 2D array from a 1D array.
+
 
 Date handling
 -------------
@@ -58,6 +88,74 @@ to a non-transparent background.
 new in matplotlib-1.3
 =====================
 
+New in 1.3.1
+------------
+
+1.3.1 is a bugfix release, primarily dealing with improved setup and
+handling of dependencies, and correcting and enhancing the
+documentation.
+
+The following changes were made in 1.3.1 since 1.3.0.
+
+Enhancements
+````````````
+
+- Added a context manager for creating multi-page pdfs (see
+  `matplotlib.backends.backend_pdf.PdfPages`).
+
+- The WebAgg backend should now have lower latency over heterogeneous
+  Internet connections.
+
+Bug fixes
+`````````
+
+- Histogram plots now contain the endline.
+
+- Fixes to the Molleweide projection.
+
+- Handling recent fonts from Microsoft and Macintosh-style fonts with
+  non-ascii metadata is improved.
+
+- Hatching of fill between plots now works correctly in the PDF
+  backend.
+
+- Tight bounding box support now works in the PGF backend.
+
+- Transparent figures now display correctly in the Qt4Agg backend.
+
+- Drawing lines from one subplot to another now works.
+
+- Unit handling on masked arrays has been improved.
+
+Setup and dependencies
+``````````````````````
+
+- Now works with any version of pyparsing 1.5.6 or later, without displaying
+  hundreds of warnings.
+
+- Now works with 64-bit versions of Ghostscript on MS-Windows.
+
+- When installing from source into an environment without Numpy, Numpy
+  will first be downloaded and built and then used to build
+  matplotlib.
+
+- Externally installed backends are now always imported using a
+  fully-qualified path to the module.
+
+- Works with newer version of wxPython.
+
+- Can now build with a PyCXX installed globally on the system from source.
+
+- Better detection of Gtk3 dependencies.
+
+Testing
+```````
+
+- Tests should now work in non-English locales.
+
+- PEP8 conformance tests now report on locations of issues.
+
+
 New plotting features
 ---------------------
 

examples/mplot3d/text3d_demo.py

@@ -5,15 +5,15 @@
 ax = fig.gca(projection='3d')
 
 zdirs = (None, 'x', 'y', 'z', (1, 1, 0), (1, 1, 1))
-xs = (2, 6, 4, 9, 7, 2)
-ys = (6, 4, 8, 7, 2, 2)
-zs = (4, 2, 5, 6, 1, 7)
+xs = (1, 4, 4, 9, 4, 1)
+ys = (2, 5, 8, 10, 1, 2)
+zs = (10, 3, 8, 9, 1, 8)
 
 for zdir, x, y, z in zip(zdirs, xs, ys, zs):
     label = '(%d, %d, %d), dir=%s' % (x, y, z, zdir)
     ax.text(x, y, z, label, zdir)
 
-ax.text(1, 1, 1, "red", color='red')
+ax.text(9, 0, 0, "red", color='red')
 ax.text2D(0.05, 0.95, "2D Text", transform=ax.transAxes)
 
 ax.set_xlim3d(0, 10)

examples/pylab_examples/spectrum_demo.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# python
+
+from pylab import *
+
+dt = 0.01
+Fs = 1/dt
+t = arange(0, 10, dt)
+nse = randn(len(t))
+r = exp(-t/0.05)
+
+cnse = convolve(nse, r)*dt
+cnse = cnse[:len(t)]
+s = 0.1*sin(2*pi*t) + cnse
+
+subplot(3, 2, 1)
+plot(t, s)
+
+subplot(3, 2, 3)
+magnitude_spectrum(s, Fs=Fs)
+
+subplot(3, 2, 4)
+magnitude_spectrum(s, Fs=Fs, scale='dB')
+
+subplot(3, 2, 5)
+angle_spectrum(s, Fs=Fs)
+
+subplot(3, 2, 6)
+phase_spectrum(s, Fs=Fs)
+
+show()

examples/shapes_and_collections/scatter_demo.py

@@ -8,7 +8,8 @@
 N = 50
 x = np.random.rand(N)
 y = np.random.rand(N)
+colors = np.random.rand(N)
 area = np.pi * (15 * np.random.rand(N))**2 # 0 to 15 point radiuses
 
-plt.scatter(x, y, s=area, alpha=0.5)
+plt.scatter(x, y, s=area, c=colors, alpha=0.5)
 plt.show()