Skip to content

Commit 94eaddf

Browse files
committed
fixed some problems with the file release system
svn path=/trunk/matplotlib/; revision=56
1 parent b926ffc commit 94eaddf

File tree

7 files changed

+100
-24
lines changed

7 files changed

+100
-24
lines changed

DEVNOTES

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ http://matplotlib.sourceforge.net
2929
> clearbak
3030
> make htmldocs
3131

32-
# edit setup.py to the correct version number
32+
# edit setup.py and LICENSE to the correct version number
3333
> make release
3434

3535
# anon ftp the tar.gz and exe file to SF

LICENSE

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LICENSE AGREEMENT FOR MATPLOTLIB 0.30
1+
LICENSE AGREEMENT FOR MATPLOTLIB 0.32b
22
--------------------------------------
33

44
1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and
@@ -9,30 +9,30 @@ documentation.
99
2. Subject to the terms and conditions of this License Agreement, JDH
1010
hereby grants Licensee a nonexclusive, royalty-free, world-wide
1111
license to reproduce, analyze, test, perform and/or display publicly,
12-
prepare derivative works, distribute, and otherwise use matplotlib 0.30
12+
prepare derivative works, distribute, and otherwise use matplotlib 0.32b
1313
alone or in any derivative version, provided, however, that JDH's
1414
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
1515
2002, 2003 John D. Hunter; All Rights Reserved" are retained in
16-
matplotlib 0.30 alone or in any derivative version prepared by
16+
matplotlib 0.32b alone or in any derivative version prepared by
1717
Licensee.
1818

1919
3. In the event Licensee prepares a derivative work that is based on
20-
or incorporates matplotlib 0.30 or any part thereof, and wants to make
20+
or incorporates matplotlib 0.32b or any part thereof, and wants to make
2121
the derivative work available to others as provided herein, then
2222
Licensee hereby agrees to include in any such work a brief summary of
23-
the changes made to matplotlib 0.30.
23+
the changes made to matplotlib 0.32b.
2424

25-
4. JDH is making matplotlib 0.30 available to Licensee on an "AS IS"
25+
4. JDH is making matplotlib 0.32b available to Licensee on an "AS IS"
2626
basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
2727
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
2828
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
29-
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.30 WILL NOT
29+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.32b WILL NOT
3030
INFRINGE ANY THIRD PARTY RIGHTS.
3131

3232
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
33-
MATPLOTLIB 0.30 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
33+
MATPLOTLIB 0.32b FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
3434
OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35-
MATPLOTLIB 0.30, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
35+
MATPLOTLIB 0.32b, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
3636
POSSIBILITY THEREOF.
3737

3838
6. This License Agreement will automatically terminate upon a material
@@ -44,7 +44,6 @@ Licensee. This License Agreement does not grant permission to use JDH
4444
trademarks or trade name in a trademark sense to endorse or promote
4545
products or services of Licensee, or any third party.
4646

47-
8. By copying, installing or otherwise using matplotlib 0.30, Licensee
47+
8. By copying, installing or otherwise using matplotlib 0.32b, Licensee
4848
agrees to be bound by the terms and conditions of this License
4949
Agreement.
50-

MANIFEST

+21-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,15 @@ examples/gdtest.py
2323
examples/histogram_demo.py
2424
examples/interactive.py
2525
examples/interactive2.py
26+
examples/legend_demo.py
2627
examples/line_styles.py
28+
examples/log_demo.py
2729
examples/logo.py
30+
examples/mpl_with_glade.py
31+
examples/mri_demo.py
32+
examples/mri_with_eeg.py
2833
examples/multiple_figs_demo.py
34+
examples/pcolor_demo.py
2935
examples/pstest.py
3036
examples/scatter_demo.py
3137
examples/simple_plot.py
@@ -35,9 +41,11 @@ examples/system_monitor.py
3541
examples/text_handles.py
3642
examples/text_themes.py
3743
examples/vline_demo.py
44+
examples/wx_demo.py
45+
examples/xyerrorbar.py
3846
examples/data/AAPL.dat
3947
examples/data/INTC.dat
40-
examples/data/membrane.dat
48+
examples/data/eeg.dat
4149
fonts/afm/pagd8a.afm
4250
fonts/afm/pagdo8a.afm
4351
fonts/afm/pagk8a.afm
@@ -93,20 +101,31 @@ fonts/ttf/VeraMono.ttf
93101
fonts/ttf/VeraSe.ttf
94102
fonts/ttf/VeraSeBd.ttf
95103
fonts/ttf/local.conf
104+
images/stock_close.xpm
105+
images/stock_down.xpm
106+
images/stock_left.xpm
107+
images/stock_refresh.xpm
108+
images/stock_right.xpm
109+
images/stock_save_as.xpm
110+
images/stock_up.xpm
111+
images/stock_zoom-in.xpm
112+
images/stock_zoom-out.xpm
96113
matplotlib/__init__.py
97114
matplotlib/_matlab_helpers.py
98115
matplotlib/afm.py
99116
matplotlib/artist.py
100117
matplotlib/axes.py
101118
matplotlib/backend_bases.py
102119
matplotlib/cbook.py
120+
matplotlib/colormap.py
103121
matplotlib/lines.py
104122
matplotlib/matlab.py
105123
matplotlib/mlab.py
106124
matplotlib/patches.py
125+
matplotlib/setup.py
107126
matplotlib/backends/__init__.py
108127
matplotlib/backends/backend_gd.py
109128
matplotlib/backends/backend_gtk.py
110129
matplotlib/backends/backend_ps.py
111130
matplotlib/backends/backend_template.py
112-
test/test.py
131+
matplotlib/backends/backend_wx.py

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ include examples/README
33
recursive-include examples *.py *.dat
44
include fonts/afm/*
55
include fonts/ttf/*
6+
include images/*

Makefile

+6-10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Copyright (C) 2003 <jdhunter@ace.bsd.uchicago.edu>
33
# $Header$
44
# $Log$
5+
# Revision 1.9 2003/11/06 23:09:53 jdh2358
6+
# fixed some problems with the file release system
7+
#
58
# Revision 1.8 2003/10/23 15:42:43 jdh2358
69
# fixed figure text clip bug
710
#
@@ -59,14 +62,7 @@ htmldocs:
5962
tar cfz site.tar.gz *.html screenshots tut examples
6063

6164
release: ${DISTFILES}
62-
rm -rf ${RELEASE};\
63-
mkdir ${RELEASE};\
64-
cp -a ${DISTFILES} ${RELEASE}/;\
65-
rm -rf ${RELEASE}/CVS ${RELEASE}/matplotlib/CVS ${RELEASE}/examples/CVS ${RELEASE}/examples/figures/* ${RELEASE}/examples/*.png ${RELEASE}/examples/*.pyc ${RELEASE}/matplotlib/*.png ${RELEASE}/matplotlib/*.pyc ;\
66-
tar cvfz releases/${RELEASE}.tar.gz ${RELEASE}/ --dereference;\
67-
python setup.py bdist_wininst;\
68-
cp dist/${RELEASE}.win32.exe releases/;\
69-
zip -r ${RELEASE}.zip ${RELEASE};\
70-
mv ${RELEASE}.zip releases/;\
71-
rm -rf ${RELEASE};
65+
${PYTHON} license.py ${VERSION};\
66+
${PYTHON} setup.py sdist --formats=gztar,zip;\
67+
${PYTHON} setup.py bdist_wininst;
7268

examples/simple_plot.py

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
xlabel('time (s)')
77
ylabel('voltage (mV)')
88
title('About as simple as it gets, folks')
9+
savefig('simple_plot')
910
show()

license.py

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import sys
2+
3+
if len(sys.argv)!=2:
4+
print >>sys.stderr, 'Usage: license.py version_num'
5+
6+
version = sys.argv[1]
7+
8+
s = """\
9+
LICENSE AGREEMENT FOR MATPLOTLIB %(version)s
10+
--------------------------------------
11+
12+
1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and
13+
the Individual or Organization ("Licensee") accessing and otherwise
14+
using matplotlib software in source or binary form and its associated
15+
documentation.
16+
17+
2. Subject to the terms and conditions of this License Agreement, JDH
18+
hereby grants Licensee a nonexclusive, royalty-free, world-wide
19+
license to reproduce, analyze, test, perform and/or display publicly,
20+
prepare derivative works, distribute, and otherwise use matplotlib %(version)s
21+
alone or in any derivative version, provided, however, that JDH's
22+
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
23+
2002, 2003 John D. Hunter; All Rights Reserved" are retained in
24+
matplotlib %(version)s alone or in any derivative version prepared by
25+
Licensee.
26+
27+
3. In the event Licensee prepares a derivative work that is based on
28+
or incorporates matplotlib %(version)s or any part thereof, and wants to make
29+
the derivative work available to others as provided herein, then
30+
Licensee hereby agrees to include in any such work a brief summary of
31+
the changes made to matplotlib %(version)s.
32+
33+
4. JDH is making matplotlib %(version)s available to Licensee on an "AS IS"
34+
basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
35+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
36+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
37+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB %(version)s WILL NOT
38+
INFRINGE ANY THIRD PARTY RIGHTS.
39+
40+
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
41+
MATPLOTLIB %(version)s FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
42+
OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
43+
MATPLOTLIB %(version)s, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
44+
POSSIBILITY THEREOF.
45+
46+
6. This License Agreement will automatically terminate upon a material
47+
breach of its terms and conditions.
48+
49+
7. Nothing in this License Agreement shall be deemed to create any
50+
relationship of agency, partnership, or joint venture between JDH and
51+
Licensee. This License Agreement does not grant permission to use JDH
52+
trademarks or trade name in a trademark sense to endorse or promote
53+
products or services of Licensee, or any third party.
54+
55+
8. By copying, installing or otherwise using matplotlib %(version)s, Licensee
56+
agrees to be bound by the terms and conditions of this License
57+
Agreement.
58+
""" % locals()
59+
60+
file('LICENSE', 'w').write(s)

0 commit comments

Comments
 (0)