Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1e69d06

Browse files
jdh2358jdh2358
committed
sync to 0.65
svn path=/trunk/matplotlib/; revision=781
1 parent fee4289 commit 1e69d06

5 files changed

Lines changed: 62 additions & 27 deletions

File tree

‎LICENSE/LICENSE‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LICENSE AGREEMENT FOR MATPLOTLIB 0.64
1+
LICENSE AGREEMENT FOR MATPLOTLIB 0.65
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.64
12+
derivative works, distribute, and otherwise use matplotlib 0.65
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.64 alone or in any derivative version prepared by
16+
matplotlib 0.65 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.64 or any part thereof, and wants to
20+
incorporates matplotlib 0.65 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.64.
23+
the changes made to matplotlib 0.65.
2424

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

‎MANIFEST‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ examples/barh_demo.py
261261
examples/break.py
262262
examples/color_demo.py
263263
examples/colours.py
264+
examples/contour_demo.py
264265
examples/coords_demo.py
265266
examples/coords_report.py
266267
examples/csd_demo.py
@@ -311,6 +312,7 @@ examples/integral_demo.py
311312
examples/interactive.py
312313
examples/interactive2.py
313314
examples/invert_axes.py
315+
examples/keypress_demo.py
314316
examples/layer_images.py
315317
examples/legend_demo.py
316318
examples/legend_demo2.py
@@ -335,16 +337,17 @@ examples/pcolor_demo.py
335337
examples/pcolor_demo2.py
336338
examples/pcolor_small.py
337339
examples/polar_demo.py
338-
examples/polar_demo2.py
339340
examples/polar_scatter.py
340341
examples/poormans_contour.py
341342
examples/print_stdout.py
343+
examples/printing_in_wx.py
342344
examples/psd_demo.py
343345
examples/pstest.py
344346
examples/pythonic_matplotlib.py
345347
examples/scatter_demo.py
346348
examples/scatter_demo2.py
347349
examples/scatter_profile.py
350+
examples/set_and_get.py
348351
examples/simple_plot.py
349352
examples/specgram_demo.py
350353
examples/stem_plot.py
@@ -360,6 +363,7 @@ examples/vertical_ticklabels.py
360363
examples/vline_demo.py
361364
examples/webapp_demo.py
362365
examples/wxcursor_demo.py
366+
examples/zorder_demo.py
363367
examples/data/AAPL.dat
364368
examples/data/INTC.dat
365369
examples/data/ct.raw
@@ -482,6 +486,7 @@ images/zoom_to_rect.png
482486
images/zoom_to_rect.ppm
483487
images/zoom_to_rect.svg
484488
images/zoom_to_rect.xpm
489+
lib/pylab.py
485490
lib/dateutil/__init__.py
486491
lib/dateutil/easter.py
487492
lib/dateutil/parser.py
@@ -490,13 +495,15 @@ lib/dateutil/rrule.py
490495
lib/dateutil/tz.py
491496
lib/matplotlib/.cvsignore
492497
lib/matplotlib/__init__.py
498+
lib/matplotlib/_contour.py
493499
lib/matplotlib/_image.py
494500
lib/matplotlib/_mathtext_data.py
495-
lib/matplotlib/_matlab_helpers.py
501+
lib/matplotlib/_pylab_helpers.py
496502
lib/matplotlib/_transforms.py
497503
lib/matplotlib/afm.py
498504
lib/matplotlib/artist.py
499505
lib/matplotlib/axes.py
506+
lib/matplotlib/axes.py.orig
500507
lib/matplotlib/axis.py
501508
lib/matplotlib/backend_bases.py
502509
lib/matplotlib/cbook.py
@@ -513,11 +520,13 @@ lib/matplotlib/legend.py.orig
513520
lib/matplotlib/lines.py
514521
lib/matplotlib/mathtext.py
515522
lib/matplotlib/matlab.py
523+
lib/matplotlib/matlab.py.orig
516524
lib/matplotlib/mlab.py
517525
lib/matplotlib/na_imports.py
518526
lib/matplotlib/nc_imports.py
519527
lib/matplotlib/numerix.py
520528
lib/matplotlib/patches.py
529+
lib/matplotlib/pylab.py
521530
lib/matplotlib/pyparsing.py
522531
lib/matplotlib/table.py
523532
lib/matplotlib/text.py
@@ -530,6 +539,7 @@ lib/matplotlib/backends/backend_agg.py
530539
lib/matplotlib/backends/backend_cairo.py
531540
lib/matplotlib/backends/backend_fltkagg.py
532541
lib/matplotlib/backends/backend_gd.py
542+
lib/matplotlib/backends/backend_gdk.py
533543
lib/matplotlib/backends/backend_gtk.py
534544
lib/matplotlib/backends/backend_gtkagg.py
535545
lib/matplotlib/backends/backend_gtkcairo.py
@@ -1120,11 +1130,14 @@ license/LICENSE_PIL
11201130
license/PYTZ_LICENSE.txt
11211131
src/_backend_agg.cpp
11221132
src/_backend_agg.h
1133+
src/_contour.c
11231134
src/_gtkagg.cpp
11241135
src/_image.cpp
11251136
src/_image.h
1137+
src/_na_contour.c
11261138
src/_na_image.cpp
11271139
src/_na_transforms.cpp
1140+
src/_nc_contour.c
11281141
src/_nc_image.cpp
11291142
src/_nc_transforms.cpp
11301143
src/_tkagg.cpp
@@ -1133,5 +1146,6 @@ src/_transforms.h
11331146
src/_windowing.cpp
11341147
src/ft2font.cpp
11351148
src/ft2font.h
1149+
src/gcntr.c
11361150
src/mplutils.cpp
11371151
src/mplutils.h

‎setup.py‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
BUILD_AGG = 1
2424

2525
# Render Agg to the GTK canvas
26-
#BUILD_GTKAGG = 0
27-
BUILD_GTKAGG = 'auto'
26+
BUILD_GTKAGG = 1
27+
#BUILD_GTKAGG = 'auto'
2828

2929
# build TK GUI with Agg renderer ; requires Tkinter Python extension
3030
# and Tk includes
3131
# Use False or 0 if you don't want to build
32-
#BUILD_TKAGG = 0
33-
BUILD_TKAGG = 'auto'
32+
BUILD_TKAGG = 1
33+
#BUILD_TKAGG = 'auto'
3434

3535
# build a small extension to manage the focus on win32 platforms.
36-
#BUILD_WINDOWING = 0
37-
BUILD_WINDOWING = 'auto'
36+
BUILD_WINDOWING = 1
37+
#BUILD_WINDOWING = 'auto'
3838

3939

4040
VERBOSE = False # insert lots of diagnostic prints in extension code
@@ -109,19 +109,28 @@
109109

110110
if havedate: # dates require python23 datetime
111111
# only install pytz and dateutil if the user hasn't got them
112-
try: import dateutil
113-
except ImportError:
114-
packages.append('dateutil')
115-
116-
try: import pytz
117-
except ImportError:
112+
def add_pytz():
118113
packages.append('pytz')
119-
120114
# install pytz subdirs
121115
for dirpath, dirname, filenames in os.walk(os.path.join('lib', 'pytz','zoneinfo')):
122116
packages.append('/'.join(dirpath.split(os.sep)[1:]))
123117

118+
def add_dateutil():
119+
packages.append('dateutil')
124120

121+
if sys.platform=='win32':
122+
# always add these to the win32 installer
123+
add_pytz()
124+
add_dateutil()
125+
else:
126+
# only add them if we need them
127+
try: import dateutil
128+
except ImportError:
129+
add_dateutil()
130+
131+
try: import pytz
132+
except ImportError:
133+
add_pytz()
125134

126135
build_transforms(ext_modules, packages, NUMERIX)
127136

‎setupext.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,11 @@ def add_tk_flags(module):
237237
module.include_dirs.extend(['win32_static/include/tcl84'])
238238
module.library_dirs.extend(['C:/Python23/dlls'])
239239
module.libraries.extend(['tk84', 'tcl84'])
240+
elif major==2 and minor1==4:
241+
print '\tBuilding for python24'
242+
module.include_dirs.extend(['win32_static/include/tcl84'])
243+
module.library_dirs.extend(['C:/Python24/dlls'])
244+
module.libraries.extend(['tk84', 'tcl84'])
240245
elif major==2 and minor1==2:
241246
print '\tBuilding for python22'
242247
module.include_dirs.extend(['win32_static/include/tcl83'])

‎src/_contour.c‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,16 @@ static PyMethodDef contour_methods[] =
168168
{NULL, NULL, 0, NULL}
169169
};
170170

171-
PyMODINIT_FUNC
172-
#if defined(NUMARRAY)
173171

172+
#if defined(_MSC_VER)
173+
DL_EXPORT(void)
174+
#elif defined(__cplusplus)
175+
extern "C" void
176+
#else
177+
void
178+
#endif
179+
180+
#if defined(NUMARRAY)
174181
init_na_contour(void)
175182
{
176183
(void) Py_InitModule("_na_contour", contour_methods);

0 commit comments

Comments
 (0)