Skip to content

Commit d0fff2d

Browse files
committed
sync to 0.64
svn path=/trunk/matplotlib/; revision=670
1 parent 36178c8 commit d0fff2d

File tree

8 files changed

+29
-35
lines changed

8 files changed

+29
-35
lines changed

CHANGELOG

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
New entries should be added at the top
22

3+
4+
35
==============================================================
6+
2004-11-08 matplotlib-0.64 released
7+
48
2004-11-04 Changed -dbackend processing to only use known backends, so
59
we don't clobber other non-matplotlib uses of -d, like -debug.
610

LICENSE/LICENSE

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LICENSE AGREEMENT FOR MATPLOTLIB 0.63.4
1+
LICENSE AGREEMENT FOR MATPLOTLIB 0.64
22
--------------------------------------
33

44
1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
99
2. Subject to the terms and conditions of this License Agreement, JDH
1010
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
1111
to reproduce, analyze, test, perform and/or display publicly, prepare
12-
derivative works, distribute, and otherwise use matplotlib 0.63.4
12+
derivative works, distribute, and otherwise use matplotlib 0.64
1313
alone or in any derivative version, provided, however, that JDH's
1414
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
1515
2002-2004 John D. Hunter; All Rights Reserved" are retained in
16-
matplotlib 0.63.4 alone or in any derivative version prepared by
16+
matplotlib 0.64 alone or in any derivative version prepared by
1717
Licensee.
1818

1919
3. In the event Licensee prepares a derivative work that is based on or
20-
incorporates matplotlib 0.63.4 or any part thereof, and wants to
20+
incorporates matplotlib 0.64 or any part thereof, and wants to
2121
make the derivative work available to others as provided herein, then
2222
Licensee hereby agrees to include in any such work a brief summary of
23-
the changes made to matplotlib 0.63.4.
23+
the changes made to matplotlib 0.64.
2424

25-
4. JDH is making matplotlib 0.63.4 available to Licensee on an "AS
25+
4. JDH is making matplotlib 0.64 available to Licensee on an "AS
2626
IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
2727
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
2828
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
29-
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.63.4
29+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.64
3030
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
3131

3232
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
33-
0.63.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
33+
0.64 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
3434
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35-
MATPLOTLIB 0.63.4, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
35+
MATPLOTLIB 0.64, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
3636
THE POSSIBILITY THEREOF.
3737

3838
6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee. This License Agreement does not grant permission to use JDH
4444
trademarks or trade name in a trademark sense to endorse or promote
4545
products or services of Licensee, or any third party.
4646

47-
8. By copying, installing or otherwise using matplotlib 0.63.4,
47+
8. By copying, installing or otherwise using matplotlib 0.64,
4848
Licensee agrees to be bound by the terms and conditions of this License
4949
Agreement.

MANIFEST

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ CHANGELOG
44
INSTALL
55
INTERACTIVE
66
KNOWN_BUGS
7-
MANIFEST
87
MANIFEST.in
98
Makefile
109
README
@@ -293,6 +292,7 @@ examples/fill_between.py
293292
examples/fill_demo.py
294293
examples/fill_spiral.py
295294
examples/finance_demo.py
295+
examples/font_table_ttf.py
296296
examples/fonts_demo.py
297297
examples/fonts_demo_kw.py
298298
examples/ftface_props.py
@@ -335,6 +335,8 @@ examples/pcolor_demo.py
335335
examples/pcolor_demo2.py
336336
examples/pcolor_small.py
337337
examples/polar_demo.py
338+
examples/polar_demo2.py
339+
examples/polar_scatter.py
338340
examples/poormans_contour.py
339341
examples/print_stdout.py
340342
examples/psd_demo.py
@@ -507,6 +509,7 @@ lib/matplotlib/finance.py
507509
lib/matplotlib/font_manager.py
508510
lib/matplotlib/image.py
509511
lib/matplotlib/legend.py
512+
lib/matplotlib/legend.py.orig
510513
lib/matplotlib/lines.py
511514
lib/matplotlib/mathtext.py
512515
lib/matplotlib/matlab.py
@@ -524,10 +527,12 @@ lib/matplotlib/windowing.py
524527
lib/matplotlib/backends/.cvsignore
525528
lib/matplotlib/backends/__init__.py
526529
lib/matplotlib/backends/backend_agg.py
530+
lib/matplotlib/backends/backend_cairo.py
527531
lib/matplotlib/backends/backend_fltkagg.py
528532
lib/matplotlib/backends/backend_gd.py
529533
lib/matplotlib/backends/backend_gtk.py
530534
lib/matplotlib/backends/backend_gtkagg.py
535+
lib/matplotlib/backends/backend_gtkcairo.py
531536
lib/matplotlib/backends/backend_paint.py
532537
lib/matplotlib/backends/backend_ps.py
533538
lib/matplotlib/backends/backend_svg.py

MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include API_CHANGES CHANGELOG KNOWN_BUGS GOALS INSTALL
1+
include API_CHANGES CHANGELOG KNOWN_BUGS INSTALL
22
include INTERACTIVE TODO
33
include Makefile MANIFEST.in MANIFEST
44
include .matplotlibrc

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PYTHON = /usr/local/bin/python2.3
44
VERSION = `${PYTHON} setup.py --version`
55

66
DISTFILES = API_CHANGES KNOWN_BUGS INSTALL README TODO license \
7-
CHANGELOG Makefile GOALS INTERACTIVE \
7+
CHANGELOG Makefile INTERACTIVE \
88
MANIFEST.in lib lib/matplotlib lib/dateutil lib/pytz examples setup.py
99

1010
RELEASE = matplotlib-${VERSION}

examples/polar_demo2.py

-18
This file was deleted.

lib/matplotlib/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
the exception of those in mlab.py provided by matplotlib.
141141
"""
142142

143-
__version__ = '0.64.0a'
143+
__version__ = '0.64'
144144
__revision__ = '$Revision$'
145145
__date__ = '$Date$'
146146

lib/matplotlib/axes.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,8 @@ def draw(self, renderer, *args, **kwargs):
994994
renderer.close_group('axes')
995995

996996
def errorbar(self, x, y, yerr=None, xerr=None,
997-
fmt='b-', ecolor=None, capsize=3, barsabove=False):
997+
fmt='b-', ecolor=None, capsize=3,
998+
barsabove=False, **kwargs):
998999
"""\
9991000
ERRORBAR(x, y, yerr=None, xerr=None,
10001001
fmt='b-', ecolor=None, capsize=3, barsabove=False)
@@ -1025,6 +1026,8 @@ def errorbar(self, x, y, yerr=None, xerr=None,
10251026
10261027
barsabove, if True, will plot the errorbars above the plot symbols
10271028
- default is below
1029+
1030+
kwargs are passed on to the plot command for the markers
10281031
10291032
Return value is a length 2 tuple. The first element is a list of
10301033
y symbol lines. The second element is a list of error bar lines.
@@ -1048,7 +1051,7 @@ def errorbar(self, x, y, yerr=None, xerr=None,
10481051
l0 = None
10491052

10501053
if barsabove and fmt is not None:
1051-
l0, = self.plot(x,y,fmt)
1054+
l0, = self.plot(x,y,fmt,**kwargs)
10521055

10531056
caplines = []
10541057
barlines = []
@@ -1080,7 +1083,7 @@ def errorbar(self, x, y, yerr=None, xerr=None,
10801083
caplines.extend( self.plot(x, upper, '_', ms=2*capsize) )
10811084

10821085
if not barsabove and fmt is not None:
1083-
l0, = self.plot(x,y,fmt)
1086+
l0, = self.plot(x,y,fmt,**kwargs)
10841087

10851088
if ecolor is None and l0 is None:
10861089
ecolor = rcParams['lines.color']

0 commit comments

Comments
 (0)