Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ff162fd

Browse filesBrowse files
mdboommdboom
committed
Merged revisions 4444-4490 via svnmerge from
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib ........ r4457 | jdh2358 | 2007-11-26 16:53:01 -0500 (Mon, 26 Nov 2007) | 2 lines fixed a bug in unit processing -- thanks chris ........ r4461 | efiring | 2007-11-26 21:24:22 -0500 (Mon, 26 Nov 2007) | 5 lines Fixed pcolormesh bug Integer X input was causing Y to be turned into an integer as well. ........ r4472 | jdh2358 | 2007-11-27 13:34:38 -0500 (Tue, 27 Nov 2007) | 2 lines tagged version 91.0 for release ........ r4474 | cmoad | 2007-11-27 20:31:59 -0500 (Tue, 27 Nov 2007) | 1 line version bumps ........ r4475 | cmoad | 2007-11-27 20:33:15 -0500 (Tue, 27 Nov 2007) | 1 line rev typo fixed for 0.91 release ........ r4476 | cmoad | 2007-11-27 21:24:40 -0500 (Tue, 27 Nov 2007) | 1 line CXX/WrapPython.h was missing from sdist build ........ r4477 | cmoad | 2007-11-27 21:25:06 -0500 (Tue, 27 Nov 2007) | 1 line rev bump for new bug ........ r4478 | cmoad | 2007-11-27 21:48:38 -0500 (Tue, 27 Nov 2007) | 1 line reverting WrapPython.h inclusion ........ r4482 | mdboom | 2007-11-28 10:18:41 -0500 (Wed, 28 Nov 2007) | 2 lines Remove fonts/otf directory in list of data files. ........ r4486 | jdh2358 | 2007-11-28 13:11:27 -0500 (Wed, 28 Nov 2007) | 2 lines updated coding guide with trailing whitespace config suggestion ........ r4490 | jdh2358 | 2007-11-28 13:28:19 -0500 (Wed, 28 Nov 2007) | 2 lines fixed coding guide bug for trailing whitespace ........ svn path=/branches/transforms/; revision=4491
1 parent c278ec8 commit ff162fd
Copy full SHA for ff162fd

File tree

Expand file treeCollapse file tree

8 files changed

+61
-33
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+61
-33
lines changed

‎API_CHANGES

Copy file name to clipboardExpand all lines: API_CHANGES
+10-8Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ TRANSFORMS REFACTORING
3333
Bbox.height() Bbox.height
3434

3535
Bbox.intervalx().get_bounds() Bbox.intervalx
36-
Bbox.intervalx().set_bounds()
36+
Bbox.intervalx().set_bounds()
3737
[Bbox.intervalx is now a property.]
3838

3939
Bbox.intervaly().get_bounds() Bbox.intervaly
40-
Bbox.intervaly().set_bounds()
40+
Bbox.intervaly().set_bounds()
4141
[Bbox.intervaly is now a property.]
4242

4343
Bbox.xmin() Bbox.x0 or Bbox.xmin
@@ -84,7 +84,7 @@ TRANSFORMS REFACTORING
8484
[Axes.set_position() now accepts either four scalars or a
8585
transforms Bbox instance.]
8686

87-
[also returns a Bbox]
87+
[also returns a Bbox]
8888
Axes.toggle_log_lineary() Axes.set_yscale()
8989
[Since the recfactoring allows for more than two scale types
9090
('log' or 'linear'), it no longer makes sense to have a
@@ -119,10 +119,10 @@ TRANSFORMS REFACTORING
119119

120120
contour.py
121121
Contour._segments Contour.get_paths()
122-
[Contour.get_paths() now returns a list of path.Path instances.]
122+
[Contour.get_paths() now returns a list of path.Path instances.]
123123

124124
figure.py
125-
Figure.dpi.get()/set() Figure.dpi (a property)
125+
Figure.dpi.get()/set() Figure.dpi (a property)
126126

127127
patches.py
128128
get_verts() get_path()
@@ -150,9 +150,9 @@ TRANSFORMS REFACTORING
150150
offsetTrans, facecolors, edgecolors, linewidths,
151151
linestyles, antialiaseds) [optional]
152152

153-
153+
154154
**changed methods** --->
155-
draw_image(self, x, y, im, bbox) draw_image(self, x, y, im, bbox,
155+
draw_image(self, x, y, im, bbox) draw_image(self, x, y, im, bbox,
156156
clippath, clippath_trans)
157157

158158
**removed methods** --->
@@ -166,9 +166,11 @@ TRANSFORMS REFACTORING
166166
draw_polygon
167167
draw_rectangle
168168
draw_regpoly_collection
169-
169+
170170
END OF TRANSFORMS REFACTORING
171171

172+
0.91.0 Released
173+
172174
Changed cbook.is_file_like to cbook.is_writable_file_like and
173175
corrected behavior.
174176

‎CHANGELOG

Copy file name to clipboardExpand all lines: CHANGELOG
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
===============================================================
2+
2007-11-27 Released 0.91.0 at revision 4478
3+
14
2007-11-13 All backends now support writing to a file-like object, not
25
just a regular file. savefig() can be passed a file-like
36
object in place of a file path. - MGD

‎CODING_GUIDE

Copy file name to clipboardExpand all lines: CODING_GUIDE
+22Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ in mind.
3939
* If you have altered extension code, do you pass
4040
unit/memleak_hawaii.py?
4141

42+
43+
4244
== Importing and name spaces ==
4345

4446
For numpy, use:
@@ -103,6 +105,26 @@ newline. It may be preferable to use a temporary variable
103105
to replace a single long line with two shorter and more
104106
readable lines.
105107

108+
Please do not commit lines with trailing white space, as it causes
109+
noise in svn diffs. If you are an emacs user, the following in your
110+
.emacs will cause emacs to strip trailing white space on save for
111+
python, C and C++
112+
113+
; and similarly for c++-mode-hook and c-mode-hook
114+
(add-hook 'python-mode-hook
115+
(lambda ()
116+
(add-hook 'write-file-functions 'delete-trailing-whitespace)))
117+
118+
119+
120+
for older versions of emacs (emacs<22) you may need to do
121+
122+
(add-hook 'python-mode-hook
123+
(lambda ()
124+
(add-hook 'local-write-file-hooks 'delete-trailing-whitespace)))
125+
126+
127+
106128

107129
== Licenses ==
108130

‎LICENSE/LICENSE

Copy file name to clipboard
+10-10Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LICENSE AGREEMENT FOR MATPLOTLIB 0.90
1+
LICENSE AGREEMENT FOR MATPLOTLIB 0.91
22
--------------------------------------
33

44
1. This LICENSE AGREEMENT is between 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.90
12+
derivative works, distribute, and otherwise use matplotlib 0.91
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-2007 John D. Hunter; All Rights Reserved" are retained in
16-
matplotlib 0.90 alone or in any derivative version prepared by
16+
matplotlib 0.91 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.90 or any part thereof, and wants to
20+
incorporates matplotlib 0.91 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.90.
23+
the changes made to matplotlib 0.91.
2424

25-
4. JDH is making matplotlib 0.90 available to Licensee on an "AS
25+
4. JDH is making matplotlib 0.91 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.90
29+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.91
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.90 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
33+
0.91 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
3434
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35-
MATPLOTLIB 0.90, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
35+
MATPLOTLIB 0.91, 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.90,
47+
8. By copying, installing or otherwise using matplotlib 0.91,
4848
Licensee agrees to be bound by the terms and conditions of this License
4949
Agreement.

‎lib/matplotlib/__init__.py

Copy file name to clipboardExpand all lines: lib/matplotlib/__init__.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
pylab (if pylab is imported).
5252
5353
matplotlib is written by John D. Hunter (jdh2358 at
54-
gmail.com).
54+
gmail.com and a host of others).
5555
"""
5656
from __future__ import generators
5757

58-
__version__ = '0.90.1'
58+
__version__ = '0.91.0'
5959
__revision__ = '$Revision$'
6060
__date__ = '$Date$'
6161

‎lib/matplotlib/axes.py

Copy file name to clipboardExpand all lines: lib/matplotlib/axes.py
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def _get_next_cycle_color(self):
180180

181181
def __call__(self, *args, **kwargs):
182182

183-
if self.axes.xaxis is not None and self.axes.xaxis is not None:
183+
if self.axes.xaxis is not None and self.axes.yaxis is not None:
184184
xunits = kwargs.pop( 'xunits', self.axes.xaxis.units)
185185
yunits = kwargs.pop( 'yunits', self.axes.yaxis.units)
186186
if xunits!=self.axes.xaxis.units:
@@ -1305,6 +1305,8 @@ def draw(self, renderer=None, inframe=False):
13051305

13061306
artists = []
13071307

1308+
1309+
13081310
if len(self.images)<=1 or renderer.option_image_nocomposite():
13091311
for im in self.images:
13101312
im.draw(renderer)
@@ -4798,7 +4800,7 @@ def pcolormesh(self, *args, **kwargs):
47984800
X = X.ravel()
47994801
Y = Y.ravel()
48004802

4801-
coords = npy.zeros(((Nx * Ny), 2), X.dtype)
4803+
coords = npy.zeros(((Nx * Ny), 2), dtype=float)
48024804
coords[:, 0] = X
48034805
coords[:, 1] = Y
48044806

‎lib/matplotlib/mlab.py

Copy file name to clipboardExpand all lines: lib/matplotlib/mlab.py
+10-10Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
* find - Return the indices where some condition is true;
1515
numpy.nonzero is similar but more general.
1616
17-
* polyfit - least squares best polynomial fit of x to y
18-
19-
* polyval - evaluate a vector for a vector of polynomial coeffs
2017
2118
* prctile - find the percentiles of a sequence
2219
@@ -29,11 +26,14 @@
2926
3027
The following are deprecated; please import directly from numpy
3128
(with care--function signatures may differ):
29+
3230
* conv - convolution (numpy.convolve)
3331
* corrcoef - The matrix of correlation coefficients
3432
* hist -- Histogram (numpy.histogram)
3533
* linspace -- Linear spaced array from min to max
3634
* meshgrid
35+
* polyfit - least squares best polynomial fit of x to y
36+
* polyval - evaluate a vector for a vector of polynomial coeffs
3737
* trapz - trapeziodal integration (trapz(x,y) -> numpy.trapz(y,x))
3838
* vander - the Vandermonde matrix
3939
@@ -46,13 +46,13 @@
4646
4747
= record array helper functions =
4848
49-
rec2csv : store record array in CSV file
50-
rec2excel : store record array in excel worksheet - required pyExcelerator
51-
rec2gtk : put record array in GTK treeview - requires gtk
52-
csv2rec : import record array from CSV file with type inspection
53-
rec_append_field : add a field/array to record array
54-
rec_drop_fields : drop fields from record array
55-
rec_join : join two record arrays on sequence of fields
49+
* rec2csv : store record array in CSV file
50+
* rec2excel : store record array in excel worksheet - required pyExcelerator
51+
* rec2gtk : put record array in GTK treeview - requires gtk
52+
* csv2rec : import record array from CSV file with type inspection
53+
* rec_append_field : add a field/array to record array
54+
* rec_drop_fields : drop fields from record array
55+
* rec_join : join two record arrays on sequence of fields
5656
5757
For the rec viewer clases (rec2csv, rec2excel and rec2gtk), there are
5858
a bunch of Format objects you can pass into the functions that will do

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
'mpl-data/fonts/pdfcorefonts/*.afm',
8989
'mpl-data/fonts/pdfcorefonts/*.txt',
9090
'mpl-data/fonts/ttf/*.ttf',
91-
'mpl-data/fonts/otf/*.otf',
9291
'mpl-data/images/*.xpm',
9392
'mpl-data/images/*.svg',
9493
'mpl-data/images/*.png',

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.