matplotlib-checkins Mailing List for matplotlib

Revision: 7331
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7331&view=rev
Author: jdh2358
Date: 2009年08月01日 19:34:05 +0000 (2009年8月01日)
Log Message:
-----------
update the readme with build requirements
Modified Paths:
--------------
 branches/v0_99_maint/release/osx/README.txt
Modified: branches/v0_99_maint/release/osx/README.txt
===================================================================
--- branches/v0_99_maint/release/osx/README.txt	2009年08月01日 19:27:43 UTC (rev 7330)
+++ branches/v0_99_maint/release/osx/README.txt	2009年08月01日 19:34:05 UTC (rev 7331)
@@ -19,6 +19,16 @@
 How to build
 --------------
 
+* You need a python framework build , numpy and wxpython to build the
+ mpl installers (wx requires this and we need wx to build the wxagg
+ extension). You can get the three required dependencies as
+ Installer apps, eg:
+
+
+ http://www.python.org/ftp/python/2.6.2/python-2.6.2-macosx2009-04-16.dmg
+ http://downloads.sourceforge.net/project/numpy/NumPy/1.3.0/numpy-1.3.0-py2.6-macosx10.5.dmg?use_mirror=voxel
+ http://downloads.sourceforge.net/project/wxpython/wxPython/2.8.10.1/wxPython2.8-osx-unicode-2.8.10.1-universal-py2.6.dmg?use_mirror=voxel
+
 * You need to make sure to unset PKG_CONFIG_PATH to make sure the
 static linking below is respected. Otherwise the mpl build script
 will dynamically link using the libs from pkgconfig if you have this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7330
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7330&view=rev
Author: jdh2358
Date: 2009年08月01日 19:27:43 +0000 (2009年8月01日)
Log Message:
-----------
more fixes for osx
Modified Paths:
--------------
 branches/v0_99_maint/doc/faq/installing_faq.rst
 branches/v0_99_maint/release/osx/Makefile
Modified: branches/v0_99_maint/doc/faq/installing_faq.rst
===================================================================
--- branches/v0_99_maint/doc/faq/installing_faq.rst	2009年08月01日 19:11:58 UTC (rev 7329)
+++ branches/v0_99_maint/doc/faq/installing_faq.rst	2009年08月01日 19:27:43 UTC (rev 7330)
@@ -298,7 +298,7 @@
 setuptools easy_install. 
 
 The mkpg installer will have a "zip" extension, and will have a name
-like file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5.zip` depending on
+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
Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile	2009年08月01日 19:11:58 UTC (rev 7329)
+++ branches/v0_99_maint/release/osx/Makefile	2009年08月01日 19:27:43 UTC (rev 7330)
@@ -1,4 +1,5 @@
-PYTHON=python2.6
+PYVERSION=2.6
+PYTHON=python${PYVERSION}
 SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
@@ -90,14 +91,14 @@
 	bdist_mpkg &&\
 	${PYTHON} setupegg.py bdist_egg &&\
 	cd dist && \
-	zip -ro matplotlib-${MPLVERSION}-py2.5-macosx10.5.zip matplotlib-${MPLVERSION}-py2.5-macosx10.5.mpkg
+	zip -ro matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5_mpkg.zip matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg
 
 upload:
 	rm -rf upload &&\
 	mkdir upload &&\
 	cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
-	cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py2.5-macosx-10.3-fat.egg upload/matplotlib-${MPLVERSION}-macosx-py2.5.egg &&\
-	cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py2.5-macosx10.5.zip upload/matplotlib-${MPLVERSION}-py2.5-mpkg.zip&&\
+	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/* jd...@fr...:uploads/
 
 all:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7329
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7329&view=rev
Author: jdh2358
Date: 2009年08月01日 19:11:58 +0000 (2009年8月01日)
Log Message:
-----------
some fixes for the binary builds
Modified Paths:
--------------
 branches/v0_99_maint/doc/faq/installing_faq.rst
 branches/v0_99_maint/doc/users/installing.rst
 branches/v0_99_maint/release/osx/Makefile
 branches/v0_99_maint/release/osx/README.txt
Modified: branches/v0_99_maint/doc/faq/installing_faq.rst
===================================================================
--- branches/v0_99_maint/doc/faq/installing_faq.rst	2009年08月01日 17:37:26 UTC (rev 7328)
+++ branches/v0_99_maint/doc/faq/installing_faq.rst	2009年08月01日 19:11:58 UTC (rev 7329)
@@ -287,11 +287,66 @@
 <http://www.python.org/download/>`_.
 
 
+.. _install_osx_binaries:
+
+Installing OSX binaries
+-----------------------
+
+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
+Installer.app, or an binary OSX egg, which you can install via
+setuptools easy_install. 
+
+The mkpg installer will have a "zip" extension, and will have a name
+like file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5.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::
+
+ Traceback (most recent call last):
+ File "<string>", line 1, in <module>
+ ImportError: No module named matplotlib
+
+then you will need to set your PYTHONPATH, eg::
+
+ export PYTHONPATH=/Library/Python/2.5/site-packages:$PYTHONPATH 
+
+See also ref:`environment-variables`.
+
 .. _easy-install-osx-egg:
 
-easy_install from egg?
+easy_install from egg
 ------------------------------
 
+You can also us the eggs we build for OSX (see the `installation
+instructions
+<http://pypi.python.org/pypi/setuptools#cygwin-mac-os-x-linux-other>`_
+for easy_install if you do not have it on your system already). You
+can try::
+
+ > easy_install matplotlib
+
+which should grab the latest egg from the sourceforge site, but the
+naming conventions for OSX eggs appear to be broken (see below) so
+there is no guarantee the right egg will be found. We recommend you
+download the latest egg from our `download site
+<http://sourceforge.net/projects/matplotlib/files/>`_ directly to your
+harddrive, and manually install it with
+
+ > easy_install --install-dir=~/dev/lib/python2.5/site-packages/ matplotlib-0.99.0.rc1-py2.5-macosx-10.5-i386.egg 
+
+
 Some users have reported problems with the egg for 0.98 from the
 matplotlib download site, with ``easy_install``, getting an error::
 
Modified: branches/v0_99_maint/doc/users/installing.rst
===================================================================
--- branches/v0_99_maint/doc/users/installing.rst	2009年08月01日 17:37:26 UTC (rev 7328)
+++ branches/v0_99_maint/doc/users/installing.rst	2009年08月01日 19:11:58 UTC (rev 7329)
@@ -63,14 +63,17 @@
 And a *voila*, a figure pops up. But we are putting the cart ahead of
 the horse -- first we need to get matplotlib installed. We provide
 prebuilt binaries for OS X and Windows on the matplotlib `download
-<http://sourceforge.net/project/showfiles.php?group_id=80706>`_ page.
-Click on the latest release of the "matplotlib" package, choose your
-python version (2.4 or 2.5) and your platform (macosx or win32) and
-you should be good to go. If you have any problems, please check the
+<http://sourceforge.net/projects/matplotlib/files/>`_ page. Click on
+the latest release of the "matplotlib" package, choose your python
+version (2.4 or 2.5) and your platform (macosx or win32) and you
+should be good to go. If you have any problems, please check the
 :ref:`installing-faq`, google around a little bit, and post a question
 the `mailing list
 <http://sourceforge.net/project/showfiles.php?group_id=80706>`_.
 
+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
Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile	2009年08月01日 17:37:26 UTC (rev 7328)
+++ branches/v0_99_maint/release/osx/Makefile	2009年08月01日 19:11:58 UTC (rev 7329)
@@ -1,3 +1,4 @@
+PYTHON=python2.6
 SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
@@ -3,4 +4,5 @@
 FREETYPEVERSION=2.3.7
 MPLVERSION=0.99.0.rc1
+BDISTMPKGVERSION=0.4.4
 MPLSRC=matplotlib-${MPLVERSION}
 MACOSX_DEPLOYMENT_TARGET=10.4
@@ -20,8 +22,8 @@
 
 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 \
+	freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
+	bdist_mpkg-${BDISTMPKGVERSION} \
 	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
 	matplotlib-${MPLVERSION} *~
 
@@ -29,10 +31,9 @@
 	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"
+	wget 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 to install bdist_mpkg-${BDISTMPKGVERSION} now"
 
 
 
@@ -87,7 +88,7 @@
 	export CFLAGS=${CFLAGS} &&\
 	export LDFLAGS=${LDFLAGS} &&\
 	bdist_mpkg &&\
-	python setupegg.py bdist_egg &&\
+	${PYTHON} setupegg.py bdist_egg &&\
 	cd dist && \
 	zip -ro matplotlib-${MPLVERSION}-py2.5-macosx10.5.zip matplotlib-${MPLVERSION}-py2.5-macosx10.5.mpkg
 
Modified: branches/v0_99_maint/release/osx/README.txt
===================================================================
--- branches/v0_99_maint/release/osx/README.txt	2009年08月01日 17:37:26 UTC (rev 7328)
+++ branches/v0_99_maint/release/osx/README.txt	2009年08月01日 19:11:58 UTC (rev 7329)
@@ -7,9 +7,7 @@
 -------------
 
 * :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
+ mpkg installers. 
 
 * :file:`data` - some config files and patches needed for the build
 
@@ -38,7 +36,7 @@
 
 * install the patched bdist_mpkg, that the fetch_deps step just created::
 
- cd bdist_mpkg-0.4.3
+ cd bdist_mpkg-0.4.4
 sudo python setup.py install
 
 * build the dependencies::
@@ -64,7 +62,7 @@
 cd release/osx/
 unset PKG_CONFIG_PATH
 make fetch_deps
- cd bdist_mpkg-0.4.3
+ cd bdist_mpkg-0.4.4
 sudo python setup.py install
 cd ..
 make dependencies
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7328
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7328&view=rev
Author: jdh2358
Date: 2009年08月01日 17:37:26 +0000 (2009年8月01日)
Log Message:
-----------
Applied Michiel's sf patch 2823885 to remove the /usr/X11R6 dirs from darwin
Modified Paths:
--------------
 branches/v0_99_maint/doc/_templates/index.html
 branches/v0_99_maint/doc/users/installing.rst
 branches/v0_99_maint/setupext.py
Modified: branches/v0_99_maint/doc/_templates/index.html
===================================================================
--- branches/v0_99_maint/doc/_templates/index.html	2009年07月31日 18:55:17 UTC (rev 7327)
+++ branches/v0_99_maint/doc/_templates/index.html	2009年08月01日 17:37:26 UTC (rev 7328)
@@ -3,7 +3,7 @@
 
 
 {% block body %}
- <h1>Welcome</h1>
+ <h1>mpl</h1>
 
 <p>matplotlib is a python 2D plotting library which produces
 publication quality figures in a variety of hardcopy formats and
Modified: branches/v0_99_maint/doc/users/installing.rst
===================================================================
--- branches/v0_99_maint/doc/users/installing.rst	2009年07月31日 18:55:17 UTC (rev 7327)
+++ branches/v0_99_maint/doc/users/installing.rst	2009年08月01日 17:37:26 UTC (rev 7328)
@@ -114,7 +114,8 @@
 These are external packages which you will need to install before
 installing matplotlib. Windows users only need the first two (python
 and numpy) since the others are built into the matplotlib windows
-installers available for download at the sourceforge site.
+installers available for download at the sourceforge site. If you are
+building on OSX, see :ref:`build_osx`
 
 :term:`python` 2.4 (or later but not python3)
 matplotlib requires python 2.4 or later (`download <http://www.python.org/download/>`__)
@@ -183,3 +184,19 @@
 
 
 
+.. _build_osx:
+
+Building on OSX
+==================
+
+The build situation on OSX is complicated by the various places one
+can get the png and freetype requirements from (darwinports, fink,
+/usr/X11R6) and the different architectures (x86, ppc, universal) and
+the different OSX version (10.4 and 10.5). We recommend that you build
+the way we do for the OSX release: by grabbing the tarbar or svn
+repository, cd-ing into the release/osx dir, and following the
+instruction in the README. This directory has a Makefile which will
+automatically grab the zlib, png and freetype dependencies from the
+web, build them with the right flags to make universal libraries, and
+then build the matplotlib source and binary installers. 
+ 
\ No newline at end of file
Modified: branches/v0_99_maint/setupext.py
===================================================================
--- branches/v0_99_maint/setupext.py	2009年07月31日 18:55:17 UTC (rev 7327)
+++ branches/v0_99_maint/setupext.py	2009年08月01日 17:37:26 UTC (rev 7328)
@@ -51,7 +51,7 @@
 'linux' : ['/usr/local', '/usr',],
 'cygwin' : ['/usr/local', '/usr',],
 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
- '/usr', '/sw', '/usr/X11R6'],
+ '/usr', '/sw'],
 'freebsd4' : ['/usr/local', '/usr'],
 'freebsd5' : ['/usr/local', '/usr'],
 'freebsd6' : ['/usr/local', '/usr'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.