[Merge] lp:~jtaylor/ubuntu/trusty/python-numpy/new-upstream-20140124 into lp:ubuntu/python-numpy

[Martin Pitt]

Review: Approve

Thanks Julian. That certainly makes the pandas build better, although not working yet; two tests are still failing:

======================================================================
ERROR: test_gap_upsample (pandas.tseries.tests.test_plotting.TestTSPlot)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tseries/tests/test_plotting.py", line 523, in test_gap_upsample
    ax = low.plot()
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 1735, in plot_series
    plot_obj.generate()
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 857, in generate
    self._make_plot()
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 1241, in _make_plot
    self._make_ts_plot(data, **self.kwds)
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 1312, in _make_ts_plot
    _plot(data, 0, ax, label, self.style, **kwds)
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 1296, in _plot
    style=style, **kwds)
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tseries/plotting.py", line 77, in tsplot
    lines = plotf(ax, *args, **kwargs)
  File "/usr/lib/pymodules/python2.7/matplotlib/axes.py", line 4137, in plot
    for line in self._get_lines(*args, **kwargs):
  File "/usr/lib/pymodules/python2.7/matplotlib/axes.py", line 317, in _grab_next_args
    for seg in self._plot_args(remaining, kwargs):
  File "/usr/lib/pymodules/python2.7/matplotlib/axes.py", line 295, in _plot_args
    x, y = self._xy_from_xy(x, y)
  File "/usr/lib/pymodules/python2.7/matplotlib/axes.py", line 214, in _xy_from_xy
    by = self.axes.yaxis.update_units(y)
  File "/usr/lib/pymodules/python2.7/matplotlib/axis.py", line 1336, in update_units
    converter = munits.registry.get_converter(data)
  File "/usr/lib/pymodules/python2.7/matplotlib/units.py", line 137, in get_converter
    xravel = x.ravel()
  File "/usr/lib/python2.7/dist-packages/numpy/ma/core.py", line 4025, in ravel
    r._mask = ndarray.ravel(self._mask).reshape(r.shape)
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/core/series.py", line 981, in reshape
    return ndarray.reshape(self, newshape, order)
TypeError: an integer is required

======================================================================
ERROR: test_gaps (pandas.tseries.tests.test_plotting.TestTSPlot)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tseries/tests/test_plotting.py", line 480, in test_gaps
    ax = ts.plot()
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 1735, in plot_series
    plot_obj.generate()
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 857, in generate
    self._make_plot()
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 1241, in _make_plot
    self._make_ts_plot(data, **self.kwds)
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 1312, in _make_ts_plot
    _plot(data, 0, ax, label, self.style, **kwds)
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tools/plotting.py", line 1296, in _plot
    style=style, **kwds)
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/tseries/plotting.py", line 77, in tsplot
    lines = plotf(ax, *args, **kwargs)
  File "/usr/lib/pymodules/python2.7/matplotlib/axes.py", line 4137, in plot
    for line in self._get_lines(*args, **kwargs):
  File "/usr/lib/pymodules/python2.7/matplotlib/axes.py", line 317, in _grab_next_args
    for seg in self._plot_args(remaining, kwargs):
  File "/usr/lib/pymodules/python2.7/matplotlib/axes.py", line 295, in _plot_args
    x, y = self._xy_from_xy(x, y)
  File "/usr/lib/pymodules/python2.7/matplotlib/axes.py", line 214, in _xy_from_xy
    by = self.axes.yaxis.update_units(y)
  File "/usr/lib/pymodules/python2.7/matplotlib/axis.py", line 1336, in update_units
    converter = munits.registry.get_converter(data)
  File "/usr/lib/pymodules/python2.7/matplotlib/units.py", line 137, in get_converter
    xravel = x.ravel()
  File "/usr/lib/python2.7/dist-packages/numpy/ma/core.py", line 4025, in ravel
    r._mask = ndarray.ravel(self._mask).reshape(r.shape)
  File "/tmp/pandas-0.12.0/debian/tmp/usr/lib/python2.7/dist-packages/pandas/core/series.py", line 981, in reshape
    return ndarray.reshape(self, newshape, order)
TypeError: an integer is required

----------------------------------------------------------------------
Ran 3635 tests in 188.003s

However, this generally looks good, so I'll upload it. Thanks!
-- 
https://code.launchpad.net/~jtaylor/ubuntu/trusty/python-numpy/new-upstream-20140124/+merge/203159
Your team Ubuntu branches is subscribed to branch lp:ubuntu/python-numpy.