Initialized merge tracking via "svnmerge" with revisions "1-7318" from

mdboom · mdboom · commit 4f85be153359 · 2010-02-22T16:41:11.000Z
http://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint svn path=/trunk/matplotlib/; revision=8148
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% set title = 'matplotlib: python plotting' %}
 
- 
+
 {% block body %}
   <h1>intro</h1>
 
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
@@ -9,7 +9,7 @@ <h3>News</h3>
 pathto('users/installing') }}">installing</a>
 </p>
 
-<p>Sandro Tosi has a new book 
+<p>Sandro Tosi has a new book
 <a href="http://www.packtpub.com/matplotlib-python-development/book">Matplotlib for python
 developers</a>
 also
@@ -22,13 +22,12 @@ <h3>News</h3>
 tutorial.
 </p>
 
-
 <h3>Videos</h3>
 
 <p>Watch the <a href="http://conference.scipy.org/">SciPy</a> 2009 <a href="http://www.archive.org/details/scipy09_introTutorialDay2_1">intro</a> and <a href="http://www.archive.org/details/scipy09_advancedTutorialDay1_3">advanced</a> matplotlib tutorials
 </p>
 
-<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">talk</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>MLOSS</i></a>. 
+<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">talk</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>MLOSS</i></a>.
 </p>
 
 
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -206,19 +206,19 @@ Renderer        Filetypes      Description
                                using the `Anti-Grain Geometry`_ engine
 PS              :term:`ps`     :term:`vector graphics` -- Postscript_ output
                 :term:`eps`
-PDF		:term:`pdf`    :term:`vector graphics` --
+PDF             :term:`pdf`    :term:`vector graphics` --
                                `Portable Document Format`_
 SVG             :term:`svg`    :term:`vector graphics` --
                                `Scalable Vector Graphics`_
 :term:`Cairo`   :term:`png`    :term:`vector graphics` --
                 :term:`ps`     `Cairo graphics`_
-	        :term:`pdf`
-	        :term:`svg`
-	        ...
+                :term:`pdf`
+                :term:`svg`
+                ...
 :term:`GDK`     :term:`png`    :term:`raster graphics` --
                 :term:`jpg`    the `Gimp Drawing Kit`_
-	        :term:`tiff`
-	        ...
+                :term:`tiff`
+                ...
 =============   ============   ================================================
 
 And here are the user interfaces and renderer combinations supported:
@@ -264,8 +264,8 @@ There is a `bug in PyGTK-2.4`_. You need to edit
 :file:`pygobject.h` to add the :cmacro:`G_BEGIN_DECLS` and :cmacro:`G_END_DECLS`
 macros, and rename :cdata:`typename` parameter to :cdata:`typename_`::
 
-  -			  const char *typename,
-  +			  const char *typename_,
+  -                       const char *typename,
+  +                       const char *typename_,
 
 .. _`bug in PyGTK-2.4`: http://bugzilla.gnome.org/show_bug.cgi?id=155304
 
@@ -294,20 +294,22 @@ Installing OSX binaries
 -----------------------
 
 If you want to install matplotlib from one of the binary installers we
-build, you have two choices: a dmg installer, which is a typical
+build, you have two choices: a mpkg 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__'
 
@@ -319,23 +321,9 @@ If you get an error like::
 
 then you will need to set your PYTHONPATH, eg::
 
-    export PYTHONPATH=/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages:$PYTHONPATH
-
-See also :ref:`environment-variables`.
-
-
-If you are upgrading your matplotlib using the dmg installer over an
-Enthought Python Distribution, you may get an error like "You must use
-a framework install of python".  EPD puts their python in a directory
-like :file:``//Library/Frameworks/Python.framework/Versions/4.3.0``
-where 4.3.0 is an EPD version number.  The mpl installer needs the
-`python` version number, so you need to create a symlink pointing your
-python version to the EPS version before installing matplotlib.  For
-example, for python veersion 2.5 and EPD version 4.3.0::
-
-  > cd /Library/Frameworks/Python.framework/Versions
-  > ln -s 4.3.0 2.5
+    export PYTHONPATH=/Library/Python/2.5/site-packages:$PYTHONPATH
 
+See also ref:`environment-variables`.
 
 .. _easy-install-osx-egg:
 
@@ -411,25 +399,25 @@ previous version of MPL was installed (Looks something like ``./matplotlib-0.98.
        #branch="release"
        branch="trunk"
        if [  $branch = "trunk" ]
-    	  then
-    	  echo getting the trunk
-    	  svn co https://matplotlib.svn.sourceforge.net/svnroot/$NAME/trunk/$NAME $NAME
-    	  cd $NAME
-
-	fi
-	if [ $branch = "release" ]
-   	   then
-      	   echo getting the maintenance branch
-      	   svn co https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v${VERSION}_maint $NAME$VERSION
-      	   cd $NAME$VERSION
- 	fi
-  	export CFLAGS="-Os -arch i386"
-  	export LDFLAGS="-Os -arch i386"
-  	export PKG_CONFIG_PATH="/usr/x11/lib/pkgconfig"
-  	export ARCHFLAGS="-arch i386"
-  	python setup.py build
-  	python setup.py install #--prefix=$PREFIX #Use this if you don't want it installed into your default location
-	cd ..
+          then
+          echo getting the trunk
+          svn co https://matplotlib.svn.sourceforge.net/svnroot/$NAME/trunk/$NAME $NAME
+          cd $NAME
+
+        fi
+        if [ $branch = "release" ]
+           then
+           echo getting the maintenance branch
+           svn co https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v${VERSION}_maint $NAME$VERSION
+           cd $NAME$VERSION
+        fi
+        export CFLAGS="-Os -arch i386"
+        export LDFLAGS="-Os -arch i386"
+        export PKG_CONFIG_PATH="/usr/x11/lib/pkgconfig"
+        export ARCHFLAGS="-arch i386"
+        python setup.py build
+        python setup.py install #--prefix=$PREFIX #Use this if you don't want it installed into your default location
+        cd ..
 
 Run this script (for example ``sh ./install-matplotlib-epd-osx.sh``) in the
 directory in which you want the source code to be placed, or simply type the
diff --git a/doc/users/installing.rst b/doc/users/installing.rst
@@ -79,6 +79,9 @@ and running quickly::
 
     In [2]: hist(x, 100)
 
+Instructions for installing our OSX binaries are found in the FAQ
+ref:`install_osx_binaries`.
+
 Note that when testing matplotlib installations from the interactive
 python console, there are some issues relating to user interface
 toolkits and interactive settings that are discussed in
diff --git a/examples/pylab_examples/boxplot_demo2.py b/examples/pylab_examples/boxplot_demo2.py
@@ -16,9 +16,6 @@
 randomDists = ['Normal(1,1)',' Lognormal(1,1)', 'Exp(1)', 'Gumbel(6,4)',
               'Triangular(2,9,11)']
 N = 500
-
-np.random.seed(3) # make identical plots each time
-
 norm = np.random.normal(1,1, N)
 logn = np.random.lognormal(1,1, N)
 expo = np.random.exponential(1, N)
@@ -42,8 +39,8 @@
 ax1 = fig.add_subplot(111)
 plt.subplots_adjust(left=0.075, right=0.95, top=0.9, bottom=0.25)
 
-bp = plt.boxplot(data, notch=0, sym='+', vert=1, whis=1.5, patch_artist=True)
-plt.setp(bp['boxes'], edgecolor='black')
+bp = plt.boxplot(data, notch=0, sym='+', vert=1, whis=1.5)
+plt.setp(bp['boxes'], color='black')
 plt.setp(bp['whiskers'], color='black')
 plt.setp(bp['fliers'], color='red', marker='+')
 
@@ -64,12 +61,25 @@
 medians = range(numBoxes)
 for i in range(numBoxes):
   box = bp['boxes'][i]
+  boxX = []
+  boxY = []
+  for j in range(5):
+      boxX.append(box.get_xdata()[j])
+      boxY.append(box.get_ydata()[j])
+  boxCoords = zip(boxX,boxY)
+  # Alternate between Dark Khaki and Royal Blue
   k = i % 2
-  # Set the box colors
-  box.set_facecolor(boxColors[k])
-  # Now get the medians
+  boxPolygon = Polygon(boxCoords, facecolor=boxColors[k])
+  ax1.add_patch(boxPolygon)
+  # Now draw the median lines back over what we just filled in
   med = bp['medians'][i]
-  medians[i] = med.get_ydata()[0]
+  medianX = []
+  medianY = []
+  for j in range(2):
+      medianX.append(med.get_xdata()[j])
+      medianY.append(med.get_ydata()[j])
+      plt.plot(medianX, medianY, 'k')
+      medians[i] = medianY[0]
   # Finally, overplot the sample averages, with horixzontal alignment
   # in the center of each box
   plt.plot([np.average(med.get_xdata())], [np.average(data[i])],
diff --git a/release/osx/Makefile b/release/osx/Makefile
@@ -22,86 +22,86 @@ CFLAGS_DEPS="-arch i386 -arch ppc -I${SRCDIR}/zlib-${ZLIBVERSION} -isysroot /Dev
 LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION} -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
 
 clean:
-	rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
-	freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
-	bdist_mpkg-${BDISTMPKGVERSION} \
-	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
-	matplotlib-${MPLVERSION} *~
+        rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
+        freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
+        bdist_mpkg-${BDISTMPKGVERSION} \
+        zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
+        matplotlib-${MPLVERSION} *~
 
 fetch:
-	curl -LO http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
-	curl -LO http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2 &&\
-	curl -LO http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
-	curl -LO http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-${BDISTMPKGVERSION}.tar.gz&&\
-	tar xvfz bdist_mpkg-${BDISTMPKGVERSION}.tar.gz &&\
-	echo "You need to install bdist_mpkg-${BDISTMPKGVERSION} now"
+        curl -LO http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
+        curl -LO http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2 &&\
+        curl -LO http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
+        curl -LO http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-${BDISTMPKGVERSION}.tar.gz&&\
+        tar xvfz bdist_mpkg-${BDISTMPKGVERSION}.tar.gz &&\
+        echo "You need to install bdist_mpkg-${BDISTMPKGVERSION} now"
 
 
 
 zlib:
-	unset PKG_CONFIG_PATH &&\
-	rm -rf zlib-${ZLIBVERSION} &&\
-	tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
-	cd zlib-${ZLIBVERSION} &&\
-	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
-	export CFLAGS=${CFLAGS_DEPS} &&\
-	export LDFLAGS=${LDFLAGS_DEPS} &&\
-	./configure &&\
-	MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_ZLIB} LDFLAGS=${LDFLAGS_ZLIB} make -j3&& \
-	unset MACOSX_DEPLOYMENT_TARGET
+        unset PKG_CONFIG_PATH &&\
+        rm -rf zlib-${ZLIBVERSION} &&\
+        tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+        cd zlib-${ZLIBVERSION} &&\
+        export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+        export CFLAGS=${CFLAGS_DEPS} &&\
+        export LDFLAGS=${LDFLAGS_DEPS} &&\
+        ./configure &&\
+        MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_ZLIB} LDFLAGS=${LDFLAGS_ZLIB} make -j3&& \
+        unset MACOSX_DEPLOYMENT_TARGET
 
 png: zlib
-	unset PKG_CONFIG_PATH &&\
-	rm -rf libpng-${PNGVERSION} &&\
-	tar xvfj libpng-${PNGVERSION}.tar.bz2
-	cd libpng-${PNGVERSION} &&\
-	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
-	export CFLAGS=${CFLAGS_DEPS} &&\
-	export LDFLAGS=${LDFLAGS_DEPS} &&\
-	./configure  --disable-dependency-tracking &&\
-	make -j3 &&\
-	cp .libs/libpng.a . &&\
-	unset MACOSX_DEPLOYMENT_TARGET
+        unset PKG_CONFIG_PATH &&\
+        rm -rf libpng-${PNGVERSION} &&\
+        tar xvfj libpng-${PNGVERSION}.tar.bz2
+        cd libpng-${PNGVERSION} &&\
+        export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+        export CFLAGS=${CFLAGS_DEPS} &&\
+        export LDFLAGS=${LDFLAGS_DEPS} &&\
+        ./configure  --disable-dependency-tracking &&\
+        make -j3 &&\
+        cp .libs/libpng.a . &&\
+        unset MACOSX_DEPLOYMENT_TARGET
 
 
 freetype: zlib
-	unset PKG_CONFIG_PATH &&\
-	rm -rf ${FREETYPEVERSION} &&\
-	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
-	cd freetype-${FREETYPEVERSION} &&\
-	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
-	export CFLAGS=${CFLAGS_DEPS} &&\
-	export LDFLAGS=${LDFLAGS_DEPS} &&\
-	./configure &&\
-	make -j3 &&\
-	cp objs/.libs/libfreetype.a .  &&\
-	unset MACOSX_DEPLOYMENT_TARGET
+        unset PKG_CONFIG_PATH &&\
+        rm -rf ${FREETYPEVERSION} &&\
+        tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+        cd freetype-${FREETYPEVERSION} &&\
+        export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+        export CFLAGS=${CFLAGS_DEPS} &&\
+        export LDFLAGS=${LDFLAGS_DEPS} &&\
+        ./configure &&\
+        make -j3 &&\
+        cp objs/.libs/libfreetype.a .  &&\
+        unset MACOSX_DEPLOYMENT_TARGET
 
 deps:
-	make zlib png freetype
+        make zlib png freetype
 
 installers:
-	unset PKG_CONFIG_PATH &&\
-	tar xvfz matplotlib-${MPLVERSION}.tar.gz && \
-	cd ${MPLSRC} && \
-	rm -rf build && \
-	cp ../data/setup.cfg ../data/ReadMe.txt . &&\
-	export CFLAGS=${CFLAGS} &&\
-	export LDFLAGS=${LDFLAGS} &&\
-	/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
+        unset PKG_CONFIG_PATH &&\
+        tar xvfz matplotlib-${MPLVERSION}.tar.gz && \
+        cd ${MPLSRC} && \
+        rm -rf build && \
+        cp ../data/setup.cfg ../data/ReadMe.txt . &&\
+        export CFLAGS=${CFLAGS} &&\
+        export LDFLAGS=${LDFLAGS} &&\
+        /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 &&\
-	mkdir upload &&\
-	cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
-	cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py${PYVERSION}-macosx-10.3-fat.egg upload/matplotlib-${MPLVERSION}-macosx-py${PYVERSION}.egg &&\
-	cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.zip upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
-	scp upload/* jdh2358@frs.sourceforge.net:uploads/
+        rm -rf upload &&\
+        mkdir upload &&\
+        cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
+        cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py${PYVERSION}-macosx-10.3-fat.egg upload/matplotlib-${MPLVERSION}-macosx-py${PYVERSION}.egg &&\
+        cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.zip upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
+        scp upload/* jdh2358@frs.sourceforge.net:uploads/
 
 all:
-	make clean fetch deps installers upload
+        make clean fetch deps installers upload
 
 
 
