removed tz info from dates; updated htdocs

svn path=/trunk/matplotlib/; revision=249

Author: jdh2358

.matplotlibrc

@@ -20,7 +20,7 @@
 #  - a scalar grayscale intensity such as 0.75
 
 #### CONFIGURATION BEGINS HERE
-backend      : GTK       # the default backend
+backend      : GTKAgg    # the default backend
 numerix      : Numeric   # Numeric or numarray
 interactive  : False     # see http://matplotlib.sourceforge.net/interactive.html
 
@@ -34,43 +34,46 @@ lines.linestyle   : -       # solid line
 lines.color       : b       # blue; color format or hex string
 lines.markersize  : 6       # markersize, in points
 lines.antialiased : True    # render lines in antialised (no jaggies)
-lines.data_clipping : False # Use data clipping in addition to viewport
+lines.data_clipping : True  # Use data clipping in addition to viewport
                             # clipping.  Useful if you plot long data
                             # sets with only a fraction in the viewport
 
 ### FONT
+#
 # font properties used by text.Text.  see
-# http://matplotlib.sourceforge.net/matplotlib.Font.html for more information
-# on font properties.  The 6 font properties used for font matching are given
-# below with their default values.
+# http://matplotlib.sourceforge.net/matplotlib.fonts.html for more
+# information on font properties.  The 6 font properties used for font
+# matching are given below with their default values.
 #
 # The font.family property has five values: 'serif' (e.g. Times),
-# 'sans-serif'  (e.g. Helvetica), 'cursive' (e.g. Zapf-Chancery), 'fantasy'
-# (e.g. Western), and 'monospace' (e.g. Courier).  Each of these font families
-# has a default list of font names in decreasing order of priority associated
-# with them.
+# 'sans-serif' (e.g. Helvetica), 'cursive' (e.g. Zapf-Chancery),
+# 'fantasy' (e.g. Western), and 'monospace' (e.g. Courier).  Each of
+# these font families has a default list of font names in decreasing
+# order of priority associated with them.
 # 
-# The font.style property has three values: normal (or roman), italic or
-# oblique.  The oblique style will be used for italic, if it is not present.
+# The font.style property has three values: normal (or roman), italic
+# or oblique.  The oblique style will be used for italic, if it is not
+# present.
 #
-# The font.variant property has two values: normal or small-caps.  For TrueType
-# fonts, which are scalable fonts, small-caps is equivalent to using a font
-# size of 'smaller', or about 83% of the current font size.
+# The font.variant property has two values: normal or small-caps.  For
+# TrueType fonts, which are scalable fonts, small-caps is equivalent
+# to using a font size of 'smaller', or about 83% of the current font
+# size.
 #
-# The font.weight property has effectively 13 values: normal, bold, bolder,
-# lighter, 100, 200, 300, ..., 900.  Normal is the same as 400, and bold is
-# 700.  bolder and lighter are relative values with respect to the current
-# weight.
+# The font.weight property has effectively 13 values: normal, bold,
+# bolder, lighter, 100, 200, 300, ..., 900.  Normal is the same as
+# 400, and bold is 700.  bolder and lighter are relative values with
+# respect to the current weight.
 #
-# The font.stretch property has 11 values: ultra-condensed, extra-condensed,
-# condensed, semi-condensed, normal, semi-expanded, expanded, extra-expanded,
-# ultra-expanded, wider, and narrower.  This property is not currently
-# implemented.
+# The font.stretch property has 11 values: ultra-condensed,
+# extra-condensed, condensed, semi-condensed, normal, semi-expanded,
+# expanded, extra-expanded, ultra-expanded, wider, and narrower.  This
+# property is not currently implemented.
 #
-# The font.size property has 11 values: xx-small, x-small, small, medium,
-# large, x-large, xx-large, larger, smaller, length (such as 12pt), and 
-# percentage.  larger and smaller are relative values.  percentage is not yet
-# implemented.
+# The font.size property has 11 values: xx-small, x-small, small,
+# medium, large, x-large, xx-large, larger, smaller, length (such as
+# 12pt), and percentage.  larger and smaller are relative values.
+# percentage is not yet implemented.
 #
 font.family         : sans-serif
 font.style          : normal
@@ -96,7 +99,7 @@ text.color          : k       # black
 # default fontsizes for ticklabels, and so on
 axes.facecolor      : w       # background color; white
 axes.edgecolor      : k       # edge color; black
-axes.linewidth      : 1.0     # edge linewidth
+axes.linewidth      : 0.5     # edge linewidth
 axes.grid           : False   # display grid or not
 axes.titlesize      : 14      # fontsize of the axes title
 axes.labelsize      : 12      # fontsize of the x any y labels

LICENSE/LICENSE

@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.53b
+LICENSE AGREEMENT FOR MATPLOTLIB 0.53
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and
@@ -9,30 +9,30 @@ documentation.
 2. Subject to the terms and conditions of this License Agreement, JDH
 hereby grants Licensee a nonexclusive, royalty-free, world-wide
 license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use matplotlib 0.53b
+prepare derivative works, distribute, and otherwise use matplotlib 0.53
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002, 2003 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.53b alone or in any derivative version prepared by
+matplotlib 0.53 alone or in any derivative version prepared by
 Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
-or incorporates matplotlib 0.53b or any part thereof, and wants to make
+or incorporates matplotlib 0.53 or any part thereof, and wants to make
 the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 0.53b.
+the changes made to matplotlib 0.53.
 
-4. JDH is making matplotlib 0.53b available to Licensee on an "AS IS"
+4. JDH is making matplotlib 0.53 available to Licensee on an "AS IS"
 basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.53b WILL NOT
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.53 WILL NOT
 INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
-MATPLOTLIB 0.53b FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
+MATPLOTLIB 0.53 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
 OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.53b, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
+MATPLOTLIB 0.53, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
 POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee.  This License Agreement does not grant permission to use JDH
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using matplotlib 0.53b, Licensee
+8. By copying, installing or otherwise using matplotlib 0.53, Licensee
 agrees to be bound by the terms and conditions of this License
 Agreement.

MANIFEST

@@ -5,6 +5,7 @@ GOALS
 INSTALL
 INTERACTIVE
 KNOWN_BUGS
+MANIFEST
 MANIFEST.in
 Makefile
 README
@@ -189,6 +190,7 @@ examples/embedding_in_wx.py
 examples/errorbar_demo.py
 examples/figtext.py
 examples/fill_demo.py
+examples/finance_demo.py
 examples/font_properties_demo.py
 examples/fonts_demo.py
 examples/ftface_props.py

Makefile

@@ -2,6 +2,9 @@
 # Copyright (C) 2003  <jdhunter@ace.bsd.uchicago.edu>
 # $Header$
 # $Log$
+# Revision 1.28  2004/04/20 22:53:37  jdh2358
+# removed tz info from dates; updated htdocs
+#
 # Revision 1.27  2004/04/20 11:32:35  jdh2358
 # added finance module
 #
@@ -85,43 +88,12 @@
 #
 
 PYTHON = /usr/local/bin/python2.3
-PYDOC = /usr/local/bin/pydoc
 VERSION = `${PYTHON} setup.py --version`
 
 DISTFILES = API_CHANGES KNOWN_BUGS INSTALL README TODO license	\
 	CHANGELOG Makefile GOALS INTERACTIVE			\
 	MANIFEST.in matplotlib examples setup.py
 
-MODULES =					\
-        matplotlib.afm				\
-	matplotlib.artist			\
-	matplotlib.axes				\
-	matplotlib.axis				\
-	matplotlib.backend_bases		\
-	matplotlib.backends.backend_agg		\
-	matplotlib.backends.backend_gd		\
-	matplotlib.backends.backend_gtk		\
-	matplotlib.backends.backend_gtkgd	\
-	matplotlib.backends.backend_paint       \
-	matplotlib.backends.backend_ps		\
-	matplotlib.backends.backend_template	\
-	matplotlib.backends.backend_tkagg	\
-        matplotlib.backends.backend_wx          \
-	matplotlib.cbook			\
-	matplotlib.colors			\
-	matplotlib.figure			\
-	matplotlib.image			\
-	matplotlib.legend			\
-	matplotlib.lines			\
-	matplotlib.matlab			\
-	matplotlib.mathtext			\
-	matplotlib.mlab				\
-	matplotlib.numerix      		\
-	matplotlib.patches			\
-	matplotlib.table			\
-	matplotlib.text				\
-	matplotlib.transforms			\
-
 RELEASE = matplotlib-${VERSION}
 
 
@@ -132,27 +104,21 @@ clean:
 	find examples \( -name "*.png" -o -name "*.ps"  -o -name "*.jpg" -o -name "*.eps" \) | xargs rm -f
 	find . \( -name "#*" -o -name ".#*" -o -name ".*~" -o -name "*~"\) | xargs rm -f
 
+
+release: ${DISTFILES}
+	${PYTHON} license.py ${VERSION};\
+	${PYTHON} setup.py sdist --formats=gztar,zip;
+
+pyback: 
+	tar cvfz pyback.tar.gz *.py matplotlib/*.py examples/*.py matplotlib/backends/*.py unit/*.py
+
 htmldocs: 
-	cp build/lib.linux-i686-2.3/matplotlib/*.so matplotlib/;\
-	cp build/lib.linux-i686-2.3/matplotlib/backends/*.so matplotlib/backends/;\
-	rm -rf htdocs/matplotlib;\
-	cp -a matplotlib htdocs/;\
-	rm htdocs/matplotlib/backends/*.so;\
+
 	cp examples/*.py htdocs/examples;\
 	cp .matplotlibrc NUMARRAY_ISSUES API_CHANGES htdocs/;\
-	rm -f docs/*.html;\
-	${PYDOC} -w ${MODULES};\
-	mv *.html docs/
 	cd htdocs;\
 	${PYTHON} process_docs.py;\
 	${PYTHON} convert.py;\
 	tar cfz site.tar.gz *.html screenshots tut examples gd .matplotlibrc NUMARRAY_ISSUES  API_CHANGES;\
 	cd ..;\
-	rm matplotlib/backends/*.so;\
-
-release: ${DISTFILES}
-	${PYTHON} license.py ${VERSION};\
-	${PYTHON} setup.py sdist --formats=gztar,zip;
-
-pyback: 
-	tar cvfz pyback.tar.gz *.py matplotlib/*.py examples/*.py matplotlib/backends/*.py unit/*.py
+	cp -a matplotlib htdocs/;

TODO

@@ -315,4 +315,8 @@
 
 -- decreasing log axes needs fix
 
--- overflow error in math.floor(ld) on stock_demo in OSX
+-- overflow error in math.floor(ld) on stock_demo in OSX
+
+-- DONE modify pcolor to allow custom cmap
+
+-- Check for empty quote data returns

examples/alignment_test.py

@@ -82,5 +82,5 @@
         transy=ax.yaxis.transAxis)
 
 axis('off')
-savefig('alignment_test', dpi=300)
+#savefig('alignment_test', dpi=300)
 show()

examples/backend_driver.py

@@ -21,6 +21,7 @@
     'date_demo2.py',    
     'fill_demo.py',
     'figtext.py',
+    'finance_demo.py',
     'histogram_demo.py',
     'image_demo.py',
     'image_demo2.py',

examples/date_demo1.py

@@ -4,10 +4,10 @@
 controlling major and minor ticks
 
 All matplotlib date plotting is done by converting date instances into
-seconds since the epoch, gmtime.  The conversion, tick locating and
-formatting is done behind the scenes so this is most transparent to
-you.  The dates module provides several converter classes that you can
-pass to the date plotting functions which will convert your dates as
+seconds since the epoch.  The conversion, tick locating and formatting
+is done behind the scenes so this is most transparent to you.  The
+dates module provides several converter classes that you can pass to
+the date plotting functions which will convert your dates as
 necessary.  Currently epoch dates (already converted) are supported
 with EpochCOnverter, python2.3 datetime instances are supported with
 PyDatetimeConverter, and it won't be much work to add an mx.Datetime

examples/date_demo2.py

@@ -21,7 +21,7 @@
 
 pydates = PyDatetimeConverter()
 
-mondays   = WeekdayLocator(SATURDAY)  # every monday
+mondays   = WeekdayLocator(MONDAY)  # every monday
 months    = MonthLocator(1)           # every month
 monthsFmt  = DateFormatter('%b %d')
 

examples/finance_demo.py

@@ -0,0 +1,37 @@
+from matplotlib.matlab import *
+from matplotlib.dates import PyDatetimeConverter, MONDAY
+from matplotlib.ticker import  DateFormatter, WeekdayLocator, HourLocator, DayLocator
+from matplotlib.finance import quotes_historical_yahoo, candlestick,\
+     plot_day_summary
+
+import datetime
+
+# you can specify dates in any format you have a converter for.
+# matplotlib will convert everything under the hood to seconds since
+# the epoch, but you shouldn't have to deal with this
+date1 = datetime.date( 2004, 2, 1 )
+date2 = datetime.date( 2004, 4, 12 )
+
+# quotes in Eastern time zone
+converter = PyDatetimeConverter() 
+
+
+mondays = WeekdayLocator(MONDAY)    # major ticks on the mondays
+hours   = DayLocator()              # minor ticks on the days
+weekFormatter = DateFormatter('%b %d')  # Eg, Jan 12
+dayFormatter = DateFormatter('%d')      # Eg, 12
+
+quotes = quotes_historical_yahoo(
+    'INTC', date1, date2, converter)
+
+ax = subplot(111)
+ax.xaxis.set_major_locator(mondays)
+ax.xaxis.set_minor_locator(hours)
+ax.xaxis.set_major_formatter(weekFormatter)
+#ax.xaxis.set_minor_formatter(dayFormatter)
+
+#plot_day_summary(ax, quotes, ticksize=0.4, converter=converter)
+candlestick(ax, quotes, width=0.6, converter=converter)
+
+show()
+

examples/image_demo.py

@@ -31,6 +31,6 @@ def bivariate_normal(X, Y, sigmax=1.0, sigmay=1.0,
 
 
 axis('off')
-savefig('test')
+#savefig('test')
 show()
 

examples/psd_demo.py

@@ -17,7 +17,7 @@
 figure(2)
 psd(s, 512, 1/dt)
 
-savefig('psd_demo.png')
+#savefig('psd_demo.png')
 show()
 
 

examples/simple_plot.py

@@ -9,5 +9,5 @@
 ylabel('voltage (mV)')
 title('About as simple as it gets, folks')
 grid(True)
-savefig('simple_plot',dpi=300)
+#savefig('simple_plot',dpi=300)
 show()

examples/text_themes.py

@@ -20,5 +20,5 @@ def f(t):
 xlabel('time (s)', font, fontangle='italic')
 ylabel('voltage (mV)', font)
 
-savefig('text_themes')
+#savefig('text_themes')
 show()

setup.py

@@ -27,11 +27,11 @@
 # high quality image renderer to render to all the GUI windows
 
 # build GTK GUI with Agg renderer ; requires pygtk src distros installed
-BUILD_GTKAGG       = 1
+BUILD_GTKAGG       = 0
 
 # build TK GUI with Agg renderer ; requires Tkinter Python extension
 # and Tk includes
-BUILD_TKAGG        = 1
+BUILD_TKAGG        = 0
 
 # build a small extension to manage the focus on win32 platforms.
 BUILD_WINDOWING        = 0
@@ -85,7 +85,7 @@
     build_image(ext_modules, packages, BUILD_IMAGE)
 
 setup(name="matplotlib",
-      version= '0.53b',
+      version= '0.53',
       description = "Matlab style python plotting package",
       author = "John D. Hunter",
       author_email="jdhunter@ace.bsd.uchicago.edu",