Menu
▾
▴
SF.net SVN: matplotlib:[6602] trunk/matplotlib
|
From: <jd...@us...> - 2008-12-14 16:43:31
|
Revision: 6602
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6602&view=rev
Author: jdh2358
Date: 2008-12-14 16:43:20 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
added release dir
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/gallery.html
trunk/matplotlib/doc/devel/release_guide.rst
trunk/matplotlib/doc/users/mathtext.rst
trunk/matplotlib/examples/event_handling/path_editor.py
trunk/matplotlib/examples/pylab_examples/loadrec.py
trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
Added Paths:
-----------
trunk/matplotlib/release/
trunk/matplotlib/release/osx/
trunk/matplotlib/release/osx/Makefile
trunk/matplotlib/release/osx/README.txt
trunk/matplotlib/release/osx/data/
trunk/matplotlib/release/osx/data/bdist.patch
trunk/matplotlib/release/osx/data/setup.cfg
trunk/matplotlib/release/osx/matplotlib-0.98.5.tar.gz
Modified: trunk/matplotlib/doc/_templates/gallery.html
===================================================================
--- trunk/matplotlib/doc/_templates/gallery.html 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/doc/_templates/gallery.html 2008-12-14 16:43:20 UTC (rev 6602)
@@ -169,8 +169,6 @@
<a href="examples/pylab_examples/customize_rc.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/customize_rc.png" border="0" alt="customize_rc"/></a>
-<a href="examples/pylab_examples/dannys_example.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dannys_example.png" border="0" alt="dannys_example"/></a>
-
<a href="examples/pylab_examples/dash_control.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dash_control.png" border="0" alt="dash_control"/></a>
<a href="examples/pylab_examples/dashpointlabel.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dashpointlabel.png" border="0" alt="dashpointlabel"/></a>
@@ -477,8 +475,6 @@
<a href="examples/pylab_examples/step_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/step_demo.png" border="0" alt="step_demo"/></a>
-<a href="examples/pylab_examples/stix_fonts_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/stix_fonts_demo.png" border="0" alt="stix_fonts_demo"/></a>
-
<a href="examples/pylab_examples/subplot_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplot_demo.png" border="0" alt="subplot_demo"/></a>
<a href="examples/pylab_examples/subplot_toolbar.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplot_toolbar_00.png" border="0" alt="subplot_toolbar"/></a>
@@ -491,8 +487,6 @@
<a href="examples/pylab_examples/table_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/table_demo.png" border="0" alt="table_demo"/></a>
-<a href="examples/pylab_examples/tex_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/tex_demo.png" border="0" alt="tex_demo"/></a>
-
<a href="examples/pylab_examples/text_handles.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/text_handles.png" border="0" alt="text_handles"/></a>
<a href="examples/pylab_examples/text_rotation.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/text_rotation.png" border="0" alt="text_rotation"/></a>
@@ -509,8 +503,6 @@
<a href="examples/pylab_examples/unicode_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/unicode_demo.png" border="0" alt="unicode_demo"/></a>
-<a href="examples/pylab_examples/usetex_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/usetex_demo.png" border="0" alt="usetex_demo"/></a>
-
<a href="examples/pylab_examples/vertical_ticklabels.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/vertical_ticklabels.png" border="0" alt="vertical_ticklabels"/></a>
<a href="examples/pylab_examples/vline_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/vline_demo.png" border="0" alt="vline_demo"/></a>
Modified: trunk/matplotlib/doc/devel/release_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/release_guide.rst 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/doc/devel/release_guide.rst 2008-12-14 16:43:20 UTC (rev 6602)
@@ -42,7 +42,12 @@
* unpack the sdist and make sure you can build from that directory
* Use :file:`setup.cfg` to set the default backends. For windows and
- OSX, the default backend should be TkAgg.
+ OSX, the default backend should be TkAgg. You should also turn on
+ or off any platform specific build options you need. Importantly,
+ you also need to make sure that you delete the :file:`build` dir
+ after any changes to file:`setup.cfg` before rebuilding since cruft
+ in the :file:`build` dir can get carried along. I will add this to
+ the devel release notes,
* on windows, unix2dos the rc file
Modified: trunk/matplotlib/doc/users/mathtext.rst
===================================================================
--- trunk/matplotlib/doc/users/mathtext.rst 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/doc/users/mathtext.rst 2008-12-14 16:43:20 UTC (rev 6602)
@@ -299,5 +299,8 @@
.. plot:: pyplots/pyplot_mathtext.py
:include-source:
+.. plot:: mpl_examples/pylab_examples/mathtext_examples.py
+
+
Modified: trunk/matplotlib/examples/event_handling/path_editor.py
===================================================================
--- trunk/matplotlib/examples/event_handling/path_editor.py 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/examples/event_handling/path_editor.py 2008-12-14 16:43:20 UTC (rev 6602)
@@ -1,5 +1,3 @@
-import matplotlib
-matplotlib.use('TkAgg')
import numpy as np
import matplotlib.path as mpath
import matplotlib.patches as mpatches
Modified: trunk/matplotlib/examples/pylab_examples/loadrec.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/loadrec.py 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/examples/pylab_examples/loadrec.py 2008-12-14 16:43:20 UTC (rev 6602)
@@ -11,6 +11,6 @@
fig.autofmt_xdate()
# if you have pyExcelerator installed, you can output excel
-#import mpl_toolkits.exceltools as exceltools
-#exceltools.rec2excel(a, 'test.xls', colnum=4)
+import mpl_toolkits.exceltools as exceltools
+exceltools.rec2excel(a, 'test.xls')
show()
Modified: trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-12-14 16:43:20 UTC (rev 6602)
@@ -49,11 +49,11 @@
r'$\widehat{abc}\widetilde{def}$',
r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
- ur'Generic symbol: $\u23ce$',
+ #ur'Generic symbol: $\u23ce$',
]
-if sys.maxunicode > 0xffff:
- stests.append(ur'$\mathrm{\ue0f2 \U0001D538}$')
+#if sys.maxunicode > 0xffff:
+# stests.append(ur'$\mathrm{\ue0f2 \U0001D538}$')
from pylab import *
Added: trunk/matplotlib/release/osx/Makefile
===================================================================
--- trunk/matplotlib/release/osx/Makefile (rev 0)
+++ trunk/matplotlib/release/osx/Makefile 2008-12-14 16:43:20 UTC (rev 6602)
@@ -0,0 +1,69 @@
+SRCDIR=${PWD}
+ZLIBVERSION=1.2.3
+PNGVERSION=1.2.33
+FREETYPEVERSION=2.3.7
+MPLVERSION=0.98.5
+MPLSRC=matplotlib-0.98.5
+MACOSX_DEPLOYMENT_TARGET=10.4
+
+## You shouldn't need to configure past this point
+CFLAGS="-Os -arch ppc -arch i386 -I${SRCDIR}/zlib-1.2.3 -I${SRCDIR}/libpng-1.2.33 -I${SRCDIR}/freetype-2.3.7/include"
+
+LDFLAGS="-arch ppc -arch i386 -L${SRCDIR}/zlib-1.2.3 -L${SRCDIR}/libpng-1.2.33 -L${SRCDIR}/freetype-2.3.7"
+
+CFLAGS_DEPS="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+LDFLAGS_DEPS="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+
+clean:
+ rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
+ freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-0.4.3.tar.gz \
+ bdist_mpkg-0.4.3 \
+ zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
+ matplotlib-${MPLVERSION} *~
+
+fetch_deps:
+ 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&&\
+ wget http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-0.4.3.tar.gz&&\
+ tar xvfz bdist_mpkg-0.4.3.tar.gz &&\
+ patch -p0 < data/bdist.patch
+ echo "You need to to install bdist_mpkg-0.4.3 now"
+
+
+
+zlib:
+ rm -rf zlib-${ZLIBVERSION} &&\
+ tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+ cd zlib-${ZLIBVERSION} &&\
+ ./configure &&\
+ MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3
+
+png: zlib
+ rm -rf libpng-${PNGVERSION} &&\
+ tar xvfj libpng-${PNGVERSION}.tar.bz2
+ cd libpng-${PNGVERSION} &&\
+ ./configure --disable-dependency-tracking &&\
+ MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 &&\
+ cp .libs/libpng.a .
+
+freetype: zlib
+ rm -rf ${FREETYPEVERSION} &&\
+ tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+ cd freetype-${FREETYPEVERSION} &&\
+ ./configure &&\
+ MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 &&\
+ cp objs/.libs/libfreetype.a .
+
+dependencies:
+ make zlib png freetype
+
+installers:
+ tar xvfz matplotlib-${MPLVERSION}.tar.gz && \
+ cd ${MPLSRC} && \
+ rm -rf build && \
+ cp ../data/setup.cfg . &&\
+ CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} bdist_mpkg &&\
+ CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} python setupegg.py bdist_egg
+
+
Added: trunk/matplotlib/release/osx/README.txt
===================================================================
--- trunk/matplotlib/release/osx/README.txt (rev 0)
+++ trunk/matplotlib/release/osx/README.txt 2008-12-14 16:43:20 UTC (rev 6602)
@@ -0,0 +1,50 @@
+Building binary releases of OS X
+
+Included here is everything to build a binay package installer for OS
+X
+
+Dir Contents
+-------------
+
+* :file:`bdist_mkpg` - the distutils.extension to build Installer.app
+ mpkg installers. It is patched from the tarball with
+ file:`data/bdist.patch` because 0.4.3 is broken on OS X 10.5.
+ Instructions on how to patch and install are below
+
+* :file:`data` - some config files and patches needed for the build
+
+* :file:`*.tar.gz` - the bdist_mkpg, zlib, png, freetype and mpl
+ tarballs
+
+* :file:`Makefile` - all the build commands
+
+How to build
+--------------
+
+* OPTIONAL: edit :file:`Makefile` so that the *VERSION variables point
+ to the latest zlib, png, freetype
+
+* 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
+
+* install the patched bdist_mpkg, that the fetch_deps step just created::
+
+ cd bdist_mpkg-0.4.3
+ sudo python setup.py install
+
+* build the dependencies::
+
+ make dependencies
+
+* copy over the latest mpl *.tar.gz tarball to this directory, update
+ the MPLVERSION in the Makefile::
+
+ cp /path/to/mpl/matplotlib.0.98.5.tar.gz .
+
+* build the mkpg binary and egg
+
+ make installers
+
+ The mpkg and egg binaries will reside in :file:`matplotlib-VERSION/dist`
Added: trunk/matplotlib/release/osx/data/bdist.patch
===================================================================
--- trunk/matplotlib/release/osx/data/bdist.patch (rev 0)
+++ trunk/matplotlib/release/osx/data/bdist.patch 2008-12-14 16:43:20 UTC (rev 6602)
@@ -0,0 +1,25 @@
+diff -rNu bdist_mpkg-0.4.3/bdist_mpkg/tools.py bdist_mpkg-0.4.3.leopard/bdist_mpkg/tools.py
+--- bdist_mpkg-0.4.3/bdist_mpkg/tools.py 2006-07-09 00:39:00.000000000 -0400
++++ bdist_mpkg-0.4.3.leopard/bdist_mpkg/tools.py 2008-08-21 07:43:35.000000000 -0400
+@@ -79,15 +79,12 @@
+ yield os.path.join(root, fn)
+
+ def get_gid(name, _cache={}):
+- if not _cache:
+- for line in os.popen('/usr/bin/nidump group .'):
+- fields = line.split(':')
+- if len(fields) >= 3:
+- _cache[fields[0]] = int(fields[2])
+- try:
+- return _cache[name]
+- except KeyError:
+- raise ValueError('group %s not found' % (name,))
++ for line in os.popen("dscl . -read /Groups/" + name + " PrimaryGroupID"):
++ fields = [f.strip() for f in line.split(':')]
++ if fields[0] == "PrimaryGroupID":
++ return fields[1]
++
++ raise ValueError('group %s not found' % (name,))
+
+ def find_root(path, base='/'):
+ """
Added: trunk/matplotlib/release/osx/data/setup.cfg
===================================================================
--- trunk/matplotlib/release/osx/data/setup.cfg (rev 0)
+++ trunk/matplotlib/release/osx/data/setup.cfg 2008-12-14 16:43:20 UTC (rev 6602)
@@ -0,0 +1,78 @@
+# Rename this file to setup.cfg to modify matplotlib's
+# build options.
+
+[egg_info]
+tag_svn_revision = 1
+
+[status]
+# To suppress display of the dependencies and their versions
+# at the top of the build log, uncomment the following line:
+#suppress = True
+#
+# Uncomment to insert lots of diagnostic prints in extension code
+#verbose = True
+
+[provide_packages]
+# By default, matplotlib checks for a few dependencies and
+# installs them if missing. This feature can be turned off
+# by uncommenting the following lines. Acceptible values are:
+# True: install, overwrite an existing installation
+# False: do not install
+# auto: install only if the package is unavailable. This
+# is the default behavior
+#
+## Date/timezone support:
+pytz = True
+dateutil = True
+
+[gui_support]
+# Matplotlib supports multiple GUI toolkits, including Cocoa,
+# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
+# these toolkits requires AGG, the Anti-Grain Geometry library,
+# which is provided by matplotlib and built by default.
+#
+# Some backends are written in pure Python, and others require
+# extension code to be compiled. By default, matplotlib checks
+# for these GUI toolkits during installation and, if present,
+# compiles the required extensions to support the toolkit. GTK
+# support requires the GTK runtime environment and PyGTK. Wx
+# support requires wxWidgets and wxPython. Tk support requires
+# Tk and Tkinter. The other GUI toolkits do not require any
+# extension code, and can be used as long as the libraries are
+# installed on your system.
+#
+# You can uncomment any the following lines if you know you do
+# not want to use the GUI toolkit. Acceptible values are:
+# True: build the extension. Exits with a warning if the
+# required dependencies are not available
+# False: do not build the extension
+# auto: build if the required dependencies are available,
+# otherwise skip silently. This is the default
+# behavior
+#
+#gtk = False
+#gtkagg = False
+#tkagg = False
+#wxagg = False
+#macosx = False
+
+[rc_options]
+# User-configurable options
+#
+# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
+# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
+#
+# The Agg, Ps, Pdf and SVG backends do not require external
+# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
+# if you have disabled the relevent extension modules. Agg will be used
+# by default.
+#
+backend = TkAgg
+#
+# The numerix module was historically used to provide
+# compatibility between the Numeric, numarray, and NumPy array
+# packages. Now that NumPy has emerge as the universal array
+# package for python, numerix is not really necessary and is
+# maintained to provide backward compatibility. Do not change
+# this unless you have a compelling reason to do so.
+#numerix = numpy
Added: trunk/matplotlib/release/osx/matplotlib-0.98.5.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/release/osx/matplotlib-0.98.5.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
