fixed interactive2 and several small bugs

jdh2358 · jdh2358 · commit c8900d02c0f0 · 2003-10-18T17:54:27.000Z
svn path=/trunk/matplotlib/; revision=33
diff --git a/CHANGELOG b/CHANGELOG
@@ -104,3 +104,7 @@
 
 2003-09-30  Added legend
 
+2003-10-01 Fixed bug when colors are specified with rgb tuple or hex
+   string.
+
+
diff --git a/Makefile b/Makefile
@@ -2,6 +2,9 @@
 # Copyright (C) 2003  <jdhunter@ace.bsd.uchicago.edu>
 # $Header$
 # $Log$
+# Revision 1.7  2003/10/18 17:54:26  jdh2358
+# fixed interactive2 and several small bugs
+#
 # Revision 1.6  2003/09/30 16:15:33  jdh2358
 # added legend
 #
@@ -21,8 +24,8 @@
 # adding Makefile, releases, docs
 #
 
-PYTHON = /usr/bin/python2.2
-PYDOC = /usr/bin/pydoc
+PYTHON = /usr/local/bin/python2.3
+PYDOC = /usr/local/bin/pydoc
 VERSION = `${PYTHON} setup.py --version`
 DISTFILES = INSTALL README TODO LICENSE CHANGELOG Makefile GOALS INTERACTIVE \
 	MANIFEST.in matplotlib examples setup.py
@@ -41,9 +44,16 @@ clean:
 	find matplotlib -name "*.png"  | xargs rm -f;
 
 htmldocs: 
+	rm -rf htdocs/matplotlib;\
+	cp -a matplotlib htdocs/;\
+	cp examples/*.py htdocs/examples;\
 	rm -f docs/*.html;\
 	${PYDOC} -w ${MODULES};\
 	mv *.html docs/
+	cd htdocs;\
+	${PYTHON} process_docs.py;\
+	${PYTHON} convert.py;\
+	tar cvfz site.tar.gz *.html screenshots tut examples
 
 release: ${DISTFILES}
 	rm -rf ${RELEASE};\
diff --git a/examples/legend_demo.py b/examples/legend_demo.py
@@ -1,4 +1,4 @@
-# Thanks to Charles Twardy
+# Thanks to Charles Twardy for this example
 from matplotlib.matlab import *
 
 a = arange(0,3,.02)
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 data.extend(glob.glob('fonts/ttf/*.ttf'))
 
 setup(name="matplotlib",
-      version= '0.29',
+      version= '0.29.1',
       description = "Matlab style python plotting package",
       author = "John D. Hunter",
       author_email="jdhunter@ace.bsd.uchicago.edu",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Thanks to Charles Twardy`
	`1`	`+# Thanks to Charles Twardy for this example`
`2`	`2`	`from matplotlib.matlab import *`
`3`	`3`
`4`	`4`	`a = arange(0,3,.02)`