Menu
▾
▴
SF.net SVN: matplotlib:[7405] trunk/matplotlib
|
From: <jd...@us...> - 2009-08-06 17:09:39
|
Revision: 7405
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7405&view=rev
Author: jdh2358
Date: 2009-08-06 17:09:25 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Merged revisions 7395-7398,7400-7404 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
r7395 | jdh2358 | 2009-08-05 12:49:43 -0700 (Wed, 05 Aug 2009) | 1 line
fixed an alpha colormapping bug posted on sf 2832575
........
r7396 | jdh2358 | 2009-08-06 04:53:23 -0700 (Thu, 06 Aug 2009) | 1 line
removed pylab load and save
........
r7397 | jdh2358 | 2009-08-06 05:02:33 -0700 (Thu, 06 Aug 2009) | 1 line
tagging for 0.99 release
........
r7398 | jdh2358 | 2009-08-06 05:17:45 -0700 (Thu, 06 Aug 2009) | 1 line
final build of 0.99.0
........
r7400 | jdh2358 | 2009-08-06 07:55:54 -0700 (Thu, 06 Aug 2009) | 1 line
update whats new
........
r7401 | jdh2358 | 2009-08-06 07:58:37 -0700 (Thu, 06 Aug 2009) | 1 line
update whats new
........
r7402 | jdh2358 | 2009-08-06 08:10:45 -0700 (Thu, 06 Aug 2009) | 1 line
some updates for the release docs
........
r7403 | leejjoon | 2009-08-06 09:11:30 -0700 (Thu, 06 Aug 2009) | 1 line
fix legend bug ignoring CircleCollection
........
r7404 | jdh2358 | 2009-08-06 09:41:18 -0700 (Thu, 06 Aug 2009) | 1 line
some updates to site docs for release
........
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/doc/_templates/index.html
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/doc/api/api_changes.rst
trunk/matplotlib/doc/faq/installing_faq.rst
trunk/matplotlib/doc/users/annotations.rst
trunk/matplotlib/doc/users/plotting.rst
trunk/matplotlib/doc/users/whats_new.rst
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/colors.py
trunk/matplotlib/lib/matplotlib/pylab.py
trunk/matplotlib/release/osx/Makefile
trunk/matplotlib/release/osx/README.txt
Added Paths:
-----------
trunk/matplotlib/doc/pyplots/whats_new_99_axes_grid.py
trunk/matplotlib/doc/pyplots/whats_new_99_mplot3d.py
trunk/matplotlib/doc/pyplots/whats_new_99_spines.py
trunk/matplotlib/release/osx/data/ReadMe.txt
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_99_maint:1-7393 /branches/v0_98_5_maint:1-7253
+ /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7404
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/CHANGELOG 2009-08-06 17:09:25 UTC (rev 7405)
@@ -1,18 +1,54 @@
+2009-08-06 Tagging the 0.99.0 release at svn r7397 - JDH
+ * fixed an alpha colormapping bug posted on sf 2832575
+
+ * fix typo in axes_divider.py. use nanmin, nanmax in angle_helper.py
+ (patch by Christoph Gohlke)
+
+ * remove dup gui event in enter/leave events in gtk
+
+ * lots of fixes for os x binaries (Thanks Russell Owen)
+
+ * attach gtk events to mpl events -- fixes sf bug 2816580
+
+ * applied sf patch 2815064 (middle button events for wx) and
+ patch 2818092 (resize events for wx)
+
+ * fixed boilerplate.py so it doesn't break the ReST docs.
+
+ * removed a couple of cases of mlab.load
+
+ * fixed rec2csv win32 file handle bug from sf patch 2831018
+
+ * added two examples from Josh Hemann: examples/pylab_examples/barchart_demo2.py
+ and examples/pylab_examples/boxplot_demo2.py
+
+ * handled sf bugs 2831556 and 2830525; better bar error messages and
+ backend driver configs
+
+ * added miktex win32 patch from sf patch 2820194
+
+ * apply sf patches 2830233 and 2823885 for osx setup and 64 bit; thanks Michiel
+
+
2009-08-04 Made cbook.get_sample_data make use of the ETag and Last-Modified
headers of mod_dav_svn. - JKS
2009-08-03 Add PathCollection; modify contourf to use complex
paths instead of simple paths with cuts. - EF
+
2009-08-03 Fixed boilerplate.py so it doesn't break the ReST docs. - JKS
+2009-08-03 pylab no longer provides a load and save function. These
+ are available in matplotlib.mlab, or you can use
+ numpy.loadtxt and numpy.savetxt for text files, or np.save
+ and np.load for binary numpy arrays. - JDH
+
2009-07-31 Added cbook.get_sample_data for urllib enabled fetching and
cacheing of data needed for examples. See
examples/misc/sample_data_demo.py - JDH
-======================================================================
-
2009-07-31 Tagging 0.99.0.rc1 at 7314 - MGD
2009-07-30 Add set_cmap and register_cmap, and improve get_cmap,
Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/_templates/index.html 2009-08-06 17:09:25 UTC (rev 7405)
@@ -1,9 +1,9 @@
{% extends "layout.html" %}
{% set title = 'matplotlib: python plotting' %}
-
+
{% block body %}
- <h1>mpl</h1>
+ <h1>intro</h1>
<p>matplotlib is a python 2D plotting library which produces
publication quality figures in a variety of hardcopy formats and
@@ -41,7 +41,7 @@
<a href="http://scipy.org/Numpy_Example_List_With_Doc">numpy</a> and
<a href="api/mlab_api.html">matplotlib.mlab</a>.</p>
- <h3>Plotting commands</h3> <br/>
+ <h3>plotting commands</h3> <br/>
<table border="1" cellpadding="3" cellspacing="2">
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2009-08-06 17:09:25 UTC (rev 7405)
@@ -3,33 +3,26 @@
<p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
to support matplotlib development.</p>
-
-<p>A release candidate rc2 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing. Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
+
+<p>matplotlib 0.99 is available for <a href="http://sourceforge.net/projects/matplotlib">download</a>. See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
+pathto('users/installing') }}">installing</a>
</p>
<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>.
</p>
-<h3>Download</h3>
-
-<p>Current version: <b>{{ version }}</b></p>
-
-
-<p>Download matplotlib from the
-sourceforge <a href="http://sourceforge.net/projects/matplotlib">project</a>
-page (but first take a look at the <a href="{{
-pathto('users/installing') }}">installing</a> page). Here's a summary
-of <a href="{{ pathto('users/whats_new') }}">what's new</a>. </p>
-
<p>There are several matplotlib addon <a href="{{
pathto('users/toolkits') }}">toolkits</a>, including the projection
and mapping toolkit
-<a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>.</p>
+<a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>, 3d plotting with <a href="{{
+pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>, wild and wonderful axes and axis helpers in <a href="{{
+pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
+ </p>
<h3>Need help?</h3>
-<p>Check the <a href="{{ pathto('users/index') }}">user</a> guide,
+<p>Check the <a href="{{ pathto('users/index') }}">user guide</a>,
the <a href="{{ pathto('faq/index') }}">faq</a>, the <a href="{{
pathto('api/index') }}">api</a> docs,
<a href="http://www.nabble.com/matplotlib---users-f2906.html">archives</a>,
Modified: trunk/matplotlib/doc/api/api_changes.rst
===================================================================
--- trunk/matplotlib/doc/api/api_changes.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/api/api_changes.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -18,9 +18,14 @@
.. _configobj: http://www.voidspace.org.uk/python/configobj.html
.. _`enthought.traits`: http://code.enthought.com/projects/traits
-Changes beyond 0.98.x
-=====================
+Changes in 0.99
+======================
+* pylab no longer provides a load and save function. These are
+ available in matplotlib.mlab, or you can use numpy.loadtxt and
+ numpy.savetxt for text files, or np.save and np.load for binary
+ numpy arrays.
+
* User-generated colormaps can now be added to the set recognized
by :func:`matplotlib.cm.get_cmap`. Colormaps can be made the
default and applied to the current image using
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/faq/installing_faq.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -293,23 +293,21 @@
-----------------------
If you want to install matplotlib from one of the binary installers we
-build, you have two choices: a mpkg installer, which is a typical
+build, you have two choices: a dmg installer, which is a typical
Installer.app, or an binary OSX egg, which you can install via
setuptools easy_install.
+
+The mkpg installer will have a "dmg" extension, and will have a name
+like :file:`matplotlib-0.99.0-py2.5-macosx10.5.dmg` depending on the
+python, matplotlib, and OSX versions. Save this file and double
+click it, which will open up a folder with a file in it that has the
+mpkg extension. Double click this to run the Installer.app, which
+will prompt you for a password if you need system wide installation
+privileges, and install to a directory like
+:file:`/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages`,
+again depedending on your python version. This directory should be in
+your python path, so you can test your installation with::
-The mkpg installer will have a "zip" extension, and will have a name
-like file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5_mpkg.zip` depending on
-the python, matplotlib, and OSX versions. You need to unzip this file
-using either the "unzip" command on OSX, or simply double clicking on
-it to run StuffIt Expander. When you double click on the resultant
-mpkd directory, which will have a name like
-file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5.mpkg`, it will run the
-Installer.app, prompt you for a password if you need system wide
-installation privileges, and install to a directory like
-file:`/Library/Python/2.5/site-packages/`, again depedending on your
-python version. This directory may not be in your python path, so you
-can test your installation with::
-
> python -c 'import matplotlib; print matplotlib.__version__, matplotlib.__file__'
If you get an error like::
@@ -320,9 +318,9 @@
then you will need to set your PYTHONPATH, eg::
- export PYTHONPATH=/Library/Python/2.5/site-packages:$PYTHONPATH
+ export PYTHONPATH=/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages:$PYTHONPATH
-See also ref:`environment-variables`.
+See also :ref:`environment-variables`.
.. _easy-install-osx-egg:
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404
Copied: trunk/matplotlib/doc/pyplots/whats_new_99_axes_grid.py (from rev 7404, branches/v0_99_maint/doc/pyplots/whats_new_99_axes_grid.py)
===================================================================
--- trunk/matplotlib/doc/pyplots/whats_new_99_axes_grid.py (rev 0)
+++ trunk/matplotlib/doc/pyplots/whats_new_99_axes_grid.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -0,0 +1,47 @@
+import numpy as np
+import matplotlib.pyplot as plt
+from mpl_toolkits.axes_grid.axes_rgb import RGBAxes
+
+def get_demo_image():
+ # prepare image
+ delta = 0.5
+
+ extent = (-3,4,-4,3)
+ x = np.arange(-3.0, 4.001, delta)
+ y = np.arange(-4.0, 3.001, delta)
+ X, Y = np.meshgrid(x, y)
+ import matplotlib.mlab as mlab
+ Z1 = mlab.bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
+ Z2 = mlab.bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
+ Z = (Z1 - Z2) * 10
+
+ return Z, extent
+
+
+
+def get_rgb():
+ Z, extent = get_demo_image()
+
+ Z[Z<0] = 0.
+ Z = Z/Z.max()
+
+ R = Z[:13,:13]
+ G = Z[2:,2:]
+ B = Z[:13,2:]
+
+ return R, G, B
+
+
+fig = plt.figure(1)
+ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
+
+r, g, b = get_rgb()
+kwargs = dict(origin="lower", interpolation="nearest")
+ax.imshow_rgb(r, g, b, **kwargs)
+
+ax.RGB.set_xlim(0., 9.5)
+ax.RGB.set_ylim(0.9, 10.6)
+
+
+plt.draw()
+plt.show()
Copied: trunk/matplotlib/doc/pyplots/whats_new_99_mplot3d.py (from rev 7404, branches/v0_99_maint/doc/pyplots/whats_new_99_mplot3d.py)
===================================================================
--- trunk/matplotlib/doc/pyplots/whats_new_99_mplot3d.py (rev 0)
+++ trunk/matplotlib/doc/pyplots/whats_new_99_mplot3d.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -0,0 +1,17 @@
+from mpl_toolkits.mplot3d import Axes3D
+from matplotlib import cm
+import pylab
+import random
+import numpy as np
+
+fig = pylab.figure()
+ax = Axes3D(fig)
+X = np.arange(-5, 5, 0.25)
+Y = np.arange(-5, 5, 0.25)
+X, Y = np.meshgrid(X, Y)
+R = np.sqrt(X**2 + Y**2)
+Z = np.sin(R)
+ax.plot_surface(X, Y, Z, rstride=1, cstride=1, cmap=cm.jet)
+
+pylab.show()
+
Copied: trunk/matplotlib/doc/pyplots/whats_new_99_spines.py (from rev 7404, branches/v0_99_maint/doc/pyplots/whats_new_99_spines.py)
===================================================================
--- trunk/matplotlib/doc/pyplots/whats_new_99_spines.py (rev 0)
+++ trunk/matplotlib/doc/pyplots/whats_new_99_spines.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -0,0 +1,47 @@
+import matplotlib.pyplot as plt
+import numpy as np
+from matplotlib.pyplot import show
+
+
+def adjust_spines(ax,spines):
+ for loc, spine in ax.spines.iteritems():
+ if loc in spines:
+ spine.set_position(('outward',10)) # outward by 10 points
+ else:
+ spine.set_color('none') # don't draw spine
+
+ # turn off ticks where there is no spine
+ if 'left' in spines:
+ ax.yaxis.set_ticks_position('left')
+ else:
+ # no yaxis ticks
+ ax.yaxis.set_ticks([])
+
+ if 'bottom' in spines:
+ ax.xaxis.set_ticks_position('bottom')
+ else:
+ # no xaxis ticks
+ ax.xaxis.set_ticks([])
+
+fig = plt.figure()
+
+x = np.linspace(0,2*np.pi,100)
+y = 2*np.sin(x)
+
+ax = fig.add_subplot(2,2,1)
+ax.plot(x,y)
+adjust_spines(ax,['left'])
+
+ax = fig.add_subplot(2,2,2)
+ax.plot(x,y)
+adjust_spines(ax,[])
+
+ax = fig.add_subplot(2,2,3)
+ax.plot(x,y)
+adjust_spines(ax,['left','bottom'])
+
+ax = fig.add_subplot(2,2,4)
+ax.plot(x,y)
+adjust_spines(ax,['bottom'])
+
+show()
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404
Modified: trunk/matplotlib/doc/users/annotations.rst
===================================================================
--- trunk/matplotlib/doc/users/annotations.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/users/annotations.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -3,6 +3,9 @@
Annotating text
===============
+For a more detailed introduction to annotations, see
+:ref:`plotting-guide-annotation`.
+
The uses of the basic :func:`~matplotlib.pyplot.text` command above
place text at an arbitrary position on the Axes. A common use case of
text is to annotate some feature of the plot, and the
Modified: trunk/matplotlib/doc/users/plotting.rst
===================================================================
--- trunk/matplotlib/doc/users/plotting.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/users/plotting.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -152,5 +152,4 @@
:ref:`plotting-guide-annotation`
-TODO; see :ref:`how-to-contribute-docs`.
Modified: trunk/matplotlib/doc/users/whats_new.rst
===================================================================
--- trunk/matplotlib/doc/users/whats_new.rst 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/doc/users/whats_new.rst 2009-08-06 17:09:25 UTC (rev 7405)
@@ -1,28 +1,70 @@
.. _whats-new:
-***************************
+************************
What's new in matplotlib
-***************************
+************************
-.. _whats-new-svn:
+This page just covers the highlights -- for the full story, see the
+`CHANGELOG <http://matplotlib.sourceforge.net/_static/CHANGELOG>`_
-What new in svn
-===============
+new in matplotlib-0.99
+======================
+.. _whats-new-mplot3d:
+
+mplot3d
+--------
+
+
+Reinier Heeres has ported John Porter's mplot3d over to the new
+matplotlib transformations framework, and it is now available as a
+toolkit mpl_toolkits.mplot3d. See the `examples
+<http://matplotlib.sourceforge.net/examples/mplot3d/index.html>`_ and
+:ref:`toolkit_mplot3d-tutorial`
+
+.. plot:: pyplots/whats_new_99_mplot3d.py
+
+.. _whats-new-axes-grid:
+
+axes grid toolkit
+-----------------
+
+Jae Joon has added a new toolkit to ease displaying multiple images in
+matplotlib, as well as some support for curvilinear grids to support
+the world coordinate system. See :ref:`axes_grid_users-guide-index`
+and `examples <http://matplotlib.sourceforge.net/examples/axes_grid/index.html>`_
+
+.. plot:: pyplots/whats_new_99_axes_grid.py
+
+.. _whats-new-spine:
+
Axis spine placement
--------------------
Andrew Straw has added the ability to place "axis spines" -- the lines
-that denote the data limits -- in various arbitrary locations. See
+that denote the data limits -- in various arbitrary locations. No
+longer are your axis lines constrained to be a simple rectangle around
+the figure -- you can turn on or off left, bottom, right and top, as
+well as "detach" the spine to offset it away from the data. See
+:ref:`pylab_examples-spine_placement_demo` and
:class:`matplotlib.spines.Spine`.
+.. plot:: pyplots/whats_new_99_spines.py
+
+
+New documentation
+-----------------
+
+jae-Joon Lee has written two new guides :ref:`plotting-guide-legend`
+and :ref:`plotting-guide-annotation`.
+
.. _whats-new-0-98-4:
-What new in 0.98.4
-==============================
+new in 0.98.4
+=============
It's been four months since the last matplotlib release, and there are
-a lot of new features and bug-fixes.
+a lot of new features and bug-fixes.
Thanks to Charlie Moad for testing and preparing the source release,
including binaries for OS X and Windows for python 2.4 and 2.5 (2.6
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -3819,6 +3819,8 @@
if isinstance(c, mcoll.LineCollection)])
handles.extend([c for c in self.collections
if isinstance(c, mcoll.RegularPolyCollection)])
+ handles.extend([c for c in self.collections
+ if isinstance(c, mcoll.CircleCollection)])
return handles
Modified: trunk/matplotlib/lib/matplotlib/colors.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/colors.py 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/lib/matplotlib/colors.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -488,7 +488,7 @@
if not self._isinit: self._init()
alpha = min(alpha, 1.0) # alpha must be between 0 and 1
alpha = max(alpha, 0.0)
- self._lut[:-3, -1] = alpha
+ self._lut[:,-1] = alpha
mask_bad = None
if not cbook.iterable(X):
vtype = 'scalar'
Modified: trunk/matplotlib/lib/matplotlib/pylab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pylab.py 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/lib/matplotlib/pylab.py 2009-08-06 17:09:25 UTC (rev 7405)
@@ -236,6 +236,9 @@
base_repr, binary_repr, log2, ispower2, \
rec_append_fields, rec_drop_fields, rec_join, csv2rec, rec2csv, isvector
+import matplotlib.mlab as mlab
+import matplotlib.cbook as cbook
+
from numpy import *
from numpy.fft import *
from numpy.random import *
@@ -248,3 +251,25 @@
import numpy as np
import numpy.ma as ma
+def load(*args, **kwargs):
+ raise NotImplementedError(load.__doc__)
+load.__doc__ = """\
+ pylab no longer provides a load function, though the old pylab
+ function is still available as matplotlib.mlab.load (you can refer
+ to it in pylab as "mlab.load"). However, for plain text files, we
+ recommend numpy.loadtxt, which was inspired by the old pylab.load
+ but now has more features. For loading numpy arrays, we recommend
+ numpy.load, and its analog numpy.save, which are available in
+ pylab as np.load and np.save.
+ """
+
+
+def save(*args, **kwargs):
+ raise NotImplementedError(save.__doc__)
+save.__doc__ = """\
+ pylab no longer provides a save function, though the old pylab
+ function is still available as matplotlib.mlab.save (you can still
+ refer to it in pylab as "mlab.save"). However, for plain text
+ files, we recommend numpy.savetxt. For saving numpy arrays,
+ we recommend numpy.save, and its analog numpy.load, which are
+ available in pylab as np.save and np.load."""
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404
Modified: trunk/matplotlib/release/osx/Makefile
===================================================================
--- trunk/matplotlib/release/osx/Makefile 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/release/osx/Makefile 2009-08-06 17:09:25 UTC (rev 7405)
@@ -1,10 +1,10 @@
-PYVERSION=2.5
+PYVERSION=2.6
PYTHON=python${PYVERSION}
SRCDIR=${PWD}
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0.rc2
+MPLVERSION=0.99.0
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
MACOSX_DEPLOYMENT_TARGET=10.4
@@ -28,7 +28,7 @@
zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
matplotlib-${MPLVERSION} *~
-fetch_deps:
+fetch:
wget http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
wget http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2 &&\
wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
@@ -77,7 +77,7 @@
cp objs/.libs/libfreetype.a . &&\
unset MACOSX_DEPLOYMENT_TARGET
-dependencies:
+deps:
make zlib png freetype
installers:
@@ -85,13 +85,12 @@
tar xvfz matplotlib-${MPLVERSION}.tar.gz && \
cd ${MPLSRC} && \
rm -rf build && \
- cp ../data/setup.cfg . &&\
+ cp ../data/setup.cfg ../data/ReadMe.txt . &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg &&\
- ${PYTHON} setupegg.py bdist_egg &&\
- cd dist && \
- zip -ro matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5_mpkg.zip matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg
+ /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\
+ hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
+ ${PYTHON} setupegg.py bdist_egg
upload:
rm -rf upload &&\
@@ -102,7 +101,7 @@
scp upload/* jd...@fr...:uploads/
all:
- make clean fetch_deps dependencies installers upload
+ make clean fetch deps installers upload
Modified: trunk/matplotlib/release/osx/README.txt
===================================================================
--- trunk/matplotlib/release/osx/README.txt 2009-08-06 16:41:18 UTC (rev 7404)
+++ trunk/matplotlib/release/osx/README.txt 2009-08-06 17:09:25 UTC (rev 7405)
@@ -48,16 +48,16 @@
* First fetch all the dependencies and patch bdist_mpkg for OSX 10.5.
You can do this automatically in one step with::
- make fetch_deps
+ make fetch
-* install the patched bdist_mpkg, that the fetch_deps step just created::
+* install the patched bdist_mpkg, that the fetch step just created::
cd bdist_mpkg-0.4.4
sudo python setup.py install
* build the dependencies::
- make dependencies
+ make deps
* copy over the latest mpl *.tar.gz tarball to this directory, update
the MPLVERSION in the Makefile::
@@ -77,11 +77,11 @@
cd release/osx/
unset PKG_CONFIG_PATH
- make fetch_deps
+ make fetch
cd bdist_mpkg-0.4.4
sudo python setup.py install
cd ..
- make dependencies
+ make deps
Build the mpl sdist::
Copied: trunk/matplotlib/release/osx/data/ReadMe.txt (from rev 7404, branches/v0_99_maint/release/osx/data/ReadMe.txt)
===================================================================
--- trunk/matplotlib/release/osx/data/ReadMe.txt (rev 0)
+++ trunk/matplotlib/release/osx/data/ReadMe.txt 2009-08-06 17:09:25 UTC (rev 7405)
@@ -0,0 +1,45 @@
+matplotlib for MacOS X 10.3.9 or later and Python 2.5 and Python 2.6
+
+matplotlib is a python 2D plotting library which produces publication
+quality figures in a variety of hardcopy formats and interactive
+environments across platforms. matplotlib can be used in python
+scripts, the python and ipython shell (ala matlab or mathematica), web
+application servers, and various graphical user interface toolkits.
+
+Home page: <http://matplotlib.sourceforge.net/>
+
+Before running matplotlib, you must install numpy. Binary installers
+for all these packages are available here:
+
+ <http://pythonmac.org/packages/py25-fat/index.html>.
+
+*** Back Ends ***
+
+You may use TkAgg or WXAgg back ends; Qt and GTK support is not
+provided in this package. By default this matplotlib uses TkAgg
+because Tcl/Tk is included with MacOS X.
+
+If you wish to use WXAgg then:
+* Install wxPython from:
+ <http://pythonmac.org/packages/py25-fat/index.html>.
+* Configure a matplotlibrc file, as described below.
+
+For TkAgg you may use Apple's built-in Tcl/Tk or install your own 8.4.x
+
+*** Configuring a matplotlibrc file ***
+
+If you wish to change any matplotlib settings, create a file:
+ ~/.matplotlib/matplotlibrc
+
+
+that contains at least the following information. The values shown are
+the defaults in the internal matplotlibrc file; change them as you see
+fit:
+
+# the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg WXAgg
+# Agg Cairo GD GDK Paint PS PDF SVG Template
+backend : TkAgg
+interactive : False # see http://matplotlib.sourceforge.net/interactive.html
+
+See also
+<http://matplotlib.sourceforge.net/users/customizing.html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
