Revision: 8616
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8616&view=rev
Author: jdh2358
Date: 2010-08-03 13:57:35 +0000 (Tue, 03 Aug 2010)
Log Message:
-----------
fix sage buildbot; add support for MPLSETUPCFG env var
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/make.osx
trunk/matplotlib/setupegg.py
trunk/matplotlib/setupext.py
trunk/matplotlib/test/_buildbot_mac_sage.sh
Added Paths:
-----------
trunk/matplotlib/test/setup.sageosx.cfg
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2010-08-03 05:09:49 UTC (rev 8615)
+++ trunk/matplotlib/CHANGELOG 2010-08-03 13:57:35 UTC (rev 8616)
@@ -1,3 +1,7 @@
+2010-08-03 Add support for MPLSETUPCFG variable for custom setup.cfg
+ filename. Used by sage buildbot to build an mpl w/ no gui
+ support - JDH
+
2010-08-01 Create directory specified by MPLCONFIGDIR if it does
not exist. - ADS
Modified: trunk/matplotlib/make.osx
===================================================================
--- trunk/matplotlib/make.osx 2010-08-03 05:09:49 UTC (rev 8615)
+++ trunk/matplotlib/make.osx 2010-08-03 13:57:35 UTC (rev 8616)
@@ -1,6 +1,6 @@
# build mpl into a local install dir with
# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
-
+MPLVERSION=1.0rc1
PYVERSION=2.6
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
@@ -102,6 +102,6 @@
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
rm -f ${PREFIX}/lib/*.dylib &&\
-
/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
+ VERSIONER_PYTHON_PREFER_32_BIT=yes bdist_mpkg --readme=ReadMe.txt &&\
+ hdiutil create -srcdir
dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${OSX_SDK_VER}.mpkg
dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${OSX_SDK_VER}.dmg &&\
+ VERSIONER_PYTHON_PREFER_32_BIT=yes ${PYTHON} setupegg.py bdist_egg
Modified: trunk/matplotlib/setupegg.py
===================================================================
--- trunk/matplotlib/setupegg.py 2010-08-03 05:09:49 UTC (rev 8615)
+++ trunk/matplotlib/setupegg.py 2010-08-03 13:57:35 UTC (rev 8616)
@@ -6,8 +6,5 @@
execfile('setup.py',
{'additional_params' :
{'namespace_packages' : ['mpl_toolkits'],
- 'entry_points': {'nose.plugins':
- [
- 'KnownFailure = matplotlib.testing.noseclasses:KnownFailure',
- ]
- }}})
+ #'entry_points': {'nose.plugins': ['KnownFailure =
matplotlib.testing.noseclasses:KnownFailure', ] }
+ }})
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2010-08-03 05:09:49 UTC (rev 8615)
+++ trunk/matplotlib/setupext.py 2010-08-03 13:57:35 UTC (rev 8616)
@@ -138,10 +138,11 @@
('PY_ARRAY_UNIQUE_SYMBOL', 'MPL_ARRAY_API'),
('PYCXX_ISO_CPP_LIB', '1')]
+setup_cfg = os.environ.get('MPLSETUPCFG', 'setup.cfg')
# Based on the contents of setup.cfg, determine the build options
-if os.path.exists("setup.cfg"):
+if os.path.exists(setup_cfg):
config = configparser.SafeConfigParser()
- config.read("setup.cfg")
+ config.read(setup_cfg)
try: options['display_status'] = not config.getboolean("status",
"suppress")
except: pass
Modified: trunk/matplotlib/test/_buildbot_mac_sage.sh
===================================================================
--- trunk/matplotlib/test/_buildbot_mac_sage.sh 2010-08-03 05:09:49 UTC (rev
8615)
+++ trunk/matplotlib/test/_buildbot_mac_sage.sh 2010-08-03 13:57:35 UTC (rev
8616)
@@ -1,13 +1,20 @@
#!/bin/bash
set -e
-rm -rf ${HOME}/.matplotlib/*
rm -rf build
+export MPLCONFIGDIR=${HOME}/.matplotlib_buildbot
export PATH=${HOME}/dev/bin:$PATH
-export PYTHON=${HOME}/dev/bin/python
-export PREFIX=${HOME}/devbb
+export PYTHON=/usr/bin/python2.6
+export PREFIX=${HOME}/devbb
export
PYTHONPATH=${PREFIX}/lib/python2.6/site-packages:${HOME}/dev/lib/python2.6/site-packages
+export LD_LIBRARY_PATH=${PREFIX}/lib
+export MPLSETUPCFG=test/setup.sageosx.cfg
+rm -rf ${MPLCONFIGDIR}/*
+rm -rf ${PREFIX}/lib/python2.6/site-packages/matplotlib*
+echo 'backend : Agg' > $MPLCONFIGDIR/matplotlibrc
+
+
make -f make.osx mpl_install
echo ${PYTHONPATH}
Added: trunk/matplotlib/test/setup.sageosx.cfg
===================================================================
--- trunk/matplotlib/test/setup.sageosx.cfg (rev 0)
+++ trunk/matplotlib/test/setup.sageosx.cfg 2010-08-03 13:57:35 UTC (rev
8616)
@@ -0,0 +1,83 @@
+# Rename this file to setup.cfg to modify matplotlib's
+# build options.
+
+[egg_info]
+tag_svn_revision = 1
+
+[directories]
+# Uncomment to override the default basedir in setupext.py.
+# This can be a single directory or a space-delimited list of directories.
+#basedirlist = /usr
+
+[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 = False
+#dateutil = False
+
+[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 = Agg
+#
+# 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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
