Menu
▾
▴
SF.net SVN: matplotlib:[7751] branches/v0_99_maint
|
From: <jd...@us...> - 2009-09-12 21:11:53
|
Revision: 7751
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7751&view=rev
Author: jdh2358
Date: 2009-09-12 21:11:42 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
tagging for 99.1 release candiate
Modified Paths:
--------------
branches/v0_99_maint/README.txt
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/make.osx
Modified: branches/v0_99_maint/README.txt
===================================================================
--- branches/v0_99_maint/README.txt 2009-09-11 21:22:52 UTC (rev 7750)
+++ branches/v0_99_maint/README.txt 2009-09-12 21:11:42 UTC (rev 7751)
@@ -1,61 +1,45 @@
-Overview of the matplotlib src tree
-===================================
+matplotlib for MacOS X 10.3.9 or later and Python 2.5 and Python 2.6
-This is the source directory for matplotlib, which contains the
-following files and directories.
+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.
-* doc - the matplotlib documentation. See doc/users for the user's
- documentation and doc/devel for the developers documentation
+Home page: <http://matplotlib.sourceforge.net/>
-* examples - a bunch of examples using matplotib. See
- examples/README.txt for information
+Before running matplotlib, you must install numpy. Binary installers
+for all these packages are available here:
-* setup.cfg.template - used to configure the matplotlib build process.
- Copy this file to setup.cfg if you want to override the default
- build behavior
+ <http://pythonmac.org/packages/py25-fat/index.html>.
-* matplotlibrc.template - a template file used to generate the
- matplotlibrc config file at build time. The matplotlibrc file will
- be installed in matplotlib/mpl-data/matplotlibrc
+*** Back Ends ***
-* lib - the python src code. matplotlib ships several third party
- packages here. The subdirectory lib/matplotlib contains the python
- src code for matplotlib
+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.
-* src - the matplotlib extension code, mostly C++
+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.
-* ttconv - some truetype font utilities
+For TkAgg you may use Apple's built-in Tcl/Tk or install your own 8.4.x
-* license - all the licenses for code included with matplotlib.
- matplotlib uses only BSD compatible code
+*** Configuring a matplotlibrc file ***
-* unit - some unit tests
+If you wish to change any matplotlib settings, create a file:
+ ~/.matplotlib/matplotlibrc
-* CHANGELOG - all the significant changes to matplotlib, organized by
- release. The top of this file will show you the most recent changes
-* API_CHANGES - any change that alters the API is listed here. The
- entries are organized by release, with most recent entries first
+that contains at least the following information. The values shown are
+the defaults in the internal matplotlibrc file; change them as you see
+fit:
-* MIGRATION.txt - instructions on moving from the 0.91 code to the
- 0.98 trunk.
+# 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
-* SEGFAULTS - some tips for how to diagnose and debug segfaults
-
-* setup.py - the matplotlib build script
-
-* setupext.py - some helper code for setup.py to build the matplotlib
- extensions
-
-* boilerplate.py - some code to automatically generate the pyplot
- wrappers
-
-* DEVNOTES - deprecated developer notes. TODO: update and move to the
- doc/devel framework
-
-* FILETYPES - This is a table of the output formats supported by each
- backend. TODO: move to doc/users
-
-* INTERACTIVE - instructions on using matplotlib interactively, eg
- from the python shell. TODO: update and move to doc/users.
-
+See also
+<http://matplotlib.sourceforge.net/users/customizing.html>
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2009-09-11 21:22:52 UTC (rev 7750)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2009-09-12 21:11:42 UTC (rev 7751)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.0'
+__version__ = '0.99.1rc1'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/v0_99_maint/make.osx
===================================================================
--- branches/v0_99_maint/make.osx 2009-09-11 21:22:52 UTC (rev 7750)
+++ branches/v0_99_maint/make.osx 2009-09-12 21:11:42 UTC (rev 7751)
@@ -1,6 +1,7 @@
# build mpl into a local install dir with
# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+MPLVERSION=0.99.1rc1
PYVERSION=2.6
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
@@ -10,13 +11,10 @@
## You shouldn't need to configure past this point
-CFLAGS="-Os -arch ppc -arch i386 -I{$PREFIX}/include"
-LDFLAGS="-arch ppc -arch i386 -L${PREFIX}/lib"
+CFLAGS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+LDFLAGS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
-CFLAGS_DEPS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS_DEPS="-arch i386 -arch ppc -L${PREFIX}/lib -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 \
@@ -37,10 +35,10 @@
tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
cd zlib-${ZLIBVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
./configure --prefix=${PREFIX}&&\
- MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 install&& \
+ MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} make -j3 install&& \
unset MACOSX_DEPLOYMENT_TARGET
png: zlib
@@ -49,8 +47,8 @@
tar xvfj libpng-${PNGVERSION}.tar.bz2
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
./configure --disable-dependency-tracking --prefix=${PREFIX} &&\
make -j3 install&&\
cp .libs/libpng.a . &&\
@@ -63,8 +61,8 @@
tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
cd freetype-${FREETYPEVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
./configure --prefix=${PREFIX} &&\
make -j3 install &&\
cp objs/.libs/libfreetype.a . &&\
@@ -76,12 +74,22 @@
mpl_build:
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
- python setup.py build
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
+ ${PYTHON} setup.py build
mpl_install:
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
- python setup.py install --prefix=${PREFIX}
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
+ ${PYTHON} setup.py install --prefix=${PREFIX}
+
+
+binaries:
+ unset PKG_CONFIG_PATH &&\
+ cp release/osx/data/setup.cfg release/osx/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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
