Opened 11 years ago

Closed 11 years ago

Last modified 11 years ago

#3392 closed defect (fixed)

[with patch, positive review] upgrade matplotlib to 0.98.3 release

Reported by: mabshoff Owned by: mabshoff
Priority: major Milestone: sage-3.1.2
Component: packages: standard Keywords:
Cc: Merged in:
Authors: Reviewers:
Report Upstream: Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Description

matplotlib 0.98.0 is a major release which requires python2.4 and numpy 1.1. It contains significant improvements and may require some advanced users to update their code; see migration and API_CHANGES. We are supporting a maintenance

Attachments (2)

matplotlib-sage.3.patch (11.1 KB) - added by jason 11 years ago.
Apply instead of above
trac_3392_doctest-fix.patch (910 bytes) - added by mabshoff 11 years ago.

Download all attachments as: .zip

Change History (14)

comment:1 Changed 11 years ago by jason

I think we need to upgrade to numpy 1.1.0 and do this upgrade simultaneously. I think they each require the other.

comment:2 Changed 11 years ago by jason

(see #3390 for the numpy 1.1.0 upgrade spkg).

comment:3 Changed 11 years ago by tabbott

matplotlib-sage.patch is (at least part of) what is needed to get sage to work with matplotlib 0.98; (they renamed matplotlib.patches.lines to matplotlib.lines).

Ignore matplotlib-sage.2.patch.

comment:4 Changed 11 years ago by jason

We might as well upgrade to matplotlib 0.98.3 now.

Changed 11 years ago by jason

Apply instead of above

comment:5 Changed 11 years ago by jason

  • Summary changed from upgrade matplotlib to 0.98.0 release to upgrade matplotlib to 0.98.3 release

the matplotlib-sage.3.patch above includes the other two patches and should be applied instead. the .3.patch file also includes several more fixes for things added in 3.1.1.

comment:6 Changed 11 years ago by mabshoff

  • Summary changed from upgrade matplotlib to 0.98.3 release to [with patch, needs review] upgrade matplotlib to 0.98.3 release

comment:7 Changed 11 years ago by jason

New spkg up at http://sage.math.washington.edu/home/jason/matplotlib-0.98.3.spkg

This depends on the numpy 1.1 spkg at #3390.

comment:8 Changed 11 years ago by mabshoff

  • Summary changed from [with patch, needs review] upgrade matplotlib to 0.98.3 release to [with patch, positive review] upgrade matplotlib to 0.98.3 release

Spkg and patch look good to me. I integrated Ondrej's fix from #3792 and did some cleanups to SPKG.txt. The new spkg is at

http://sage.math.washington.edu/home/mabshoff/release-cycles-3.1.2/alpha1/matplotlib-0.98.3.p0.spkg

Cheers,

Michael

comment:9 Changed 11 years ago by mabshoff

We have some deprecation warning that causes a number of doctests:

        sage -t -long devel/sage/sage/schemes/elliptic_curves/lseries_ell.py # 1 doctests failed
        sage -t -long devel/sage/sage/schemes/elliptic_curves/ell_point.py # 1 doctests failed
        sage -t -long devel/sage/sage/rings/padics/padic_base_generic.py # 1 doctests failed
        sage -t -long devel/sage/sage/rings/polynomial/polynomial_element.pyx # 1 doctests failed
        sage -t -long devel/sage/sage/modules/free_module_element.pyx # 1 doctests failed
        sage -t -long devel/sage/sage/gsl/interpolation.pyx # 1 doctests failed
        sage -t -long devel/sage/sage/gsl/fft.pyx # 1 doctests failed
        sage -t -long devel/sage/sage/gsl/dwt.pyx # 1 doctests failed
        sage -t -long devel/sage/sage/gsl/ode.pyx # 1 doctests failed
        sage -t -long devel/sage/sage/plot/plot.py # 1 doctests failed
        sage -t -long devel/sage/sage/finance/time_series.pyx # 1 doctests failed
        sage -t -long devel/sage/sage/calculus/desolvers.py # 1 doctests failed

Specifically:

sage -t -long devel/sage/sage/finance/time_series.pyx       
**********************************************************************
File "/scratch/mabshoff/release-cycle/sage-3.1.2.alpha1/tmp/time_series.py", line 926:
    sage: v.plot(points=True)
Expected nothing
Got:
    doctest:4821: DeprecationWarning: replace "faceted=False" with "edgecolors='none'"
    <BLANKLINE>
**********************************************************************

Patch coming up.

Cheers,

Michael

comment:10 Changed 11 years ago by mabshoff

With the following code all doctests pass:

    def _render_on_subplot(self,subplot):
        options = self.options()
        c = to_mpl_color(options['rgbcolor'])
        a = float(options['alpha'])
        s = int(options['pointsize'])
        scatteroptions={}
        if not faceted: scatteroptions['edgecolors'] = 'none'
        subplot.scatter(self.xdata, self.ydata, s=s, c=c, alpha=a, **scatteroptions)

Changed 11 years ago by mabshoff

comment:11 Changed 11 years ago by mabshoff

  • Resolution set to fixed
  • Status changed from new to closed

Merged both patches in Sage 3.1.2.alpha1

comment:12 Changed 11 years ago by jason

uh, as per mabshoff's request that I post something here, that last patch that he merged fixing the doctest looks reasonable, but I haven't actually applied it or doctested it or anything.

Note: See TracTickets for help on using tickets.