Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f8e135f

Browse files
committed
added release dir
svn path=/trunk/matplotlib/; revision=6602
1 parent f0a001a commit f8e135f

10 files changed

Lines changed: 236 additions & 16 deletions

File tree

doc/_templates/gallery.html

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,6 @@ <h3>Click on any image to see full size image and source code</h3>
169169

170170
<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>
171171

172-
<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>
173-
174172
<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>
175173

176174
<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 @@ <h3>Click on any image to see full size image and source code</h3>
477475

478476
<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>
479477

480-
<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>
481-
482478
<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>
483479

484480
<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 @@ <h3>Click on any image to see full size image and source code</h3>
491487

492488
<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>
493489

494-
<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>
495-
496490
<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>
497491

498492
<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 @@ <h3>Click on any image to see full size image and source code</h3>
509503

510504
<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>
511505

512-
<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>
513-
514506
<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>
515507

516508
<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>

doc/devel/release_guide.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ Packaging
4242
* unpack the sdist and make sure you can build from that directory
4343

4444
* Use :file:`setup.cfg` to set the default backends. For windows and
45-
OSX, the default backend should be TkAgg.
45+
OSX, the default backend should be TkAgg. You should also turn on
46+
or off any platform specific build options you need. Importantly,
47+
you also need to make sure that you delete the :file:`build` dir
48+
after any changes to file:`setup.cfg` before rebuilding since cruft
49+
in the :file:`build` dir can get carried along. I will add this to
50+
the devel release notes,
4651

4752
* on windows, unix2dos the rc file
4853

doc/users/mathtext.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,5 +299,8 @@ Here is an example illustrating many of these features in context.
299299
.. plot:: pyplots/pyplot_mathtext.py
300300
:include-source:
301301

302+
.. plot:: mpl_examples/pylab_examples/mathtext_examples.py
303+
304+
302305

303306

examples/event_handling/path_editor.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import matplotlib
2-
matplotlib.use('TkAgg')
31
import numpy as np
42
import matplotlib.path as mpath
53
import matplotlib.patches as mpatches

examples/pylab_examples/loadrec.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
fig.autofmt_xdate()
1212

1313
# if you have pyExcelerator installed, you can output excel
14-
#import mpl_toolkits.exceltools as exceltools
15-
#exceltools.rec2excel(a, 'test.xls', colnum=4)
14+
import mpl_toolkits.exceltools as exceltools
15+
exceltools.rec2excel(a, 'test.xls')
1616
show()

examples/pylab_examples/mathtext_examples.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
r'$\widehat{abc}\widetilde{def}$',
5050
r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
5151
r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
52-
ur'Generic symbol: $\u23ce$',
52+
#ur'Generic symbol: $\u23ce$',
5353
]
5454

55-
if sys.maxunicode > 0xffff:
56-
stests.append(ur'$\mathrm{\ue0f2 \U0001D538}$')
55+
#if sys.maxunicode > 0xffff:
56+
# stests.append(ur'$\mathrm{\ue0f2 \U0001D538}$')
5757

5858

5959
from pylab import *

release/osx/Makefile

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
SRCDIR=${PWD}
2+
ZLIBVERSION=1.2.3
3+
PNGVERSION=1.2.33
4+
FREETYPEVERSION=2.3.7
5+
MPLVERSION=0.98.5
6+
MPLSRC=matplotlib-0.98.5
7+
MACOSX_DEPLOYMENT_TARGET=10.4
8+
9+
## You shouldn't need to configure past this point
10+
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"
11+
12+
LDFLAGS="-arch ppc -arch i386 -L${SRCDIR}/zlib-1.2.3 -L${SRCDIR}/libpng-1.2.33 -L${SRCDIR}/freetype-2.3.7"
13+
14+
CFLAGS_DEPS="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
15+
LDFLAGS_DEPS="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
16+
17+
clean:
18+
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
19+
freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-0.4.3.tar.gz \
20+
bdist_mpkg-0.4.3 \
21+
zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
22+
matplotlib-${MPLVERSION} *~
23+
24+
fetch_deps:
25+
wget http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
26+
wget http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2 &&\
27+
wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
28+
wget http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-0.4.3.tar.gz&&\
29+
tar xvfz bdist_mpkg-0.4.3.tar.gz &&\
30+
patch -p0 < data/bdist.patch
31+
echo "You need to to install bdist_mpkg-0.4.3 now"
32+
33+
34+
35+
zlib:
36+
rm -rf zlib-${ZLIBVERSION} &&\
37+
tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
38+
cd zlib-${ZLIBVERSION} &&\
39+
./configure &&\
40+
MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3
41+
42+
png: zlib
43+
rm -rf libpng-${PNGVERSION} &&\
44+
tar xvfj libpng-${PNGVERSION}.tar.bz2
45+
cd libpng-${PNGVERSION} &&\
46+
./configure --disable-dependency-tracking &&\
47+
MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 &&\
48+
cp .libs/libpng.a .
49+
50+
freetype: zlib
51+
rm -rf ${FREETYPEVERSION} &&\
52+
tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
53+
cd freetype-${FREETYPEVERSION} &&\
54+
./configure &&\
55+
MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 &&\
56+
cp objs/.libs/libfreetype.a .
57+
58+
dependencies:
59+
make zlib png freetype
60+
61+
installers:
62+
tar xvfz matplotlib-${MPLVERSION}.tar.gz && \
63+
cd ${MPLSRC} && \
64+
rm -rf build && \
65+
cp ../data/setup.cfg . &&\
66+
CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} bdist_mpkg &&\
67+
CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} python setupegg.py bdist_egg
68+
69+

release/osx/README.txt

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
Building binary releases of OS X
2+
3+
Included here is everything to build a binay package installer for OS
4+
X
5+
6+
Dir Contents
7+
-------------
8+
9+
* :file:`bdist_mkpg` - the distutils.extension to build Installer.app
10+
mpkg installers. It is patched from the tarball with
11+
file:`data/bdist.patch` because 0.4.3 is broken on OS X 10.5.
12+
Instructions on how to patch and install are below
13+
14+
* :file:`data` - some config files and patches needed for the build
15+
16+
* :file:`*.tar.gz` - the bdist_mkpg, zlib, png, freetype and mpl
17+
tarballs
18+
19+
* :file:`Makefile` - all the build commands
20+
21+
How to build
22+
--------------
23+
24+
* OPTIONAL: edit :file:`Makefile` so that the *VERSION variables point
25+
to the latest zlib, png, freetype
26+
27+
* First fetch all the dependencies and patch bdist_mpkg for OSX 10.5.
28+
You can do this automatically in one step with::
29+
30+
make fetch_deps
31+
32+
* install the patched bdist_mpkg, that the fetch_deps step just created::
33+
34+
cd bdist_mpkg-0.4.3
35+
sudo python setup.py install
36+
37+
* build the dependencies::
38+
39+
make dependencies
40+
41+
* copy over the latest mpl *.tar.gz tarball to this directory, update
42+
the MPLVERSION in the Makefile::
43+
44+
cp /path/to/mpl/matplotlib.0.98.5.tar.gz .
45+
46+
* build the mkpg binary and egg
47+
48+
make installers
49+
50+
The mpkg and egg binaries will reside in :file:`matplotlib-VERSION/dist`

release/osx/data/bdist.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff -rNu bdist_mpkg-0.4.3/bdist_mpkg/tools.py bdist_mpkg-0.4.3.leopard/bdist_mpkg/tools.py
2+
--- bdist_mpkg-0.4.3/bdist_mpkg/tools.py 2006-07-09 00:39:00.000000000 -0400
3+
+++ bdist_mpkg-0.4.3.leopard/bdist_mpkg/tools.py 2008-08-21 07:43:35.000000000 -0400
4+
@@ -79,15 +79,12 @@
5+
yield os.path.join(root, fn)
6+
7+
def get_gid(name, _cache={}):
8+
- if not _cache:
9+
- for line in os.popen('/usr/bin/nidump group .'):
10+
- fields = line.split(':')
11+
- if len(fields) >= 3:
12+
- _cache[fields[0]] = int(fields[2])
13+
- try:
14+
- return _cache[name]
15+
- except KeyError:
16+
- raise ValueError('group %s not found' % (name,))
17+
+ for line in os.popen("dscl . -read /Groups/" + name + " PrimaryGroupID"):
18+
+ fields = [f.strip() for f in line.split(':')]
19+
+ if fields[0] == "PrimaryGroupID":
20+
+ return fields[1]
21+
+
22+
+ raise ValueError('group %s not found' % (name,))
23+
24+
def find_root(path, base='/'):
25+
"""

release/osx/data/setup.cfg

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Rename this file to setup.cfg to modify matplotlib's
2+
# build options.
3+
4+
[egg_info]
5+
tag_svn_revision = 1
6+
7+
[status]
8+
# To suppress display of the dependencies and their versions
9+
# at the top of the build log, uncomment the following line:
10+
#suppress = True
11+
#
12+
# Uncomment to insert lots of diagnostic prints in extension code
13+
#verbose = True
14+
15+
[provide_packages]
16+
# By default, matplotlib checks for a few dependencies and
17+
# installs them if missing. This feature can be turned off
18+
# by uncommenting the following lines. Acceptible values are:
19+
# True: install, overwrite an existing installation
20+
# False: do not install
21+
# auto: install only if the package is unavailable. This
22+
# is the default behavior
23+
#
24+
## Date/timezone support:
25+
pytz = True
26+
dateutil = True
27+
28+
[gui_support]
29+
# Matplotlib supports multiple GUI toolkits, including Cocoa,
30+
# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
31+
# these toolkits requires AGG, the Anti-Grain Geometry library,
32+
# which is provided by matplotlib and built by default.
33+
#
34+
# Some backends are written in pure Python, and others require
35+
# extension code to be compiled. By default, matplotlib checks
36+
# for these GUI toolkits during installation and, if present,
37+
# compiles the required extensions to support the toolkit. GTK
38+
# support requires the GTK runtime environment and PyGTK. Wx
39+
# support requires wxWidgets and wxPython. Tk support requires
40+
# Tk and Tkinter. The other GUI toolkits do not require any
41+
# extension code, and can be used as long as the libraries are
42+
# installed on your system.
43+
#
44+
# You can uncomment any the following lines if you know you do
45+
# not want to use the GUI toolkit. Acceptible values are:
46+
# True: build the extension. Exits with a warning if the
47+
# required dependencies are not available
48+
# False: do not build the extension
49+
# auto: build if the required dependencies are available,
50+
# otherwise skip silently. This is the default
51+
# behavior
52+
#
53+
#gtk = False
54+
#gtkagg = False
55+
#tkagg = False
56+
#wxagg = False
57+
#macosx = False
58+
59+
[rc_options]
60+
# User-configurable options
61+
#
62+
# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
63+
# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
64+
#
65+
# The Agg, Ps, Pdf and SVG backends do not require external
66+
# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
67+
# if you have disabled the relevent extension modules. Agg will be used
68+
# by default.
69+
#
70+
backend = TkAgg
71+
#
72+
# The numerix module was historically used to provide
73+
# compatibility between the Numeric, numarray, and NumPy array
74+
# packages. Now that NumPy has emerge as the universal array
75+
# package for python, numerix is not really necessary and is
76+
# maintained to provide backward compatibility. Do not change
77+
# this unless you have a compelling reason to do so.
78+
#numerix = numpy

0 commit comments

Comments
 (0)