From: <jd...@us...> - 2008-06-13 19:49:21
|
Revision: 5519 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5519&view=rev Author: jdh2358 Date: 2008-06-13 12:49:16 -0700 (Fri, 13 Jun 2008) Log Message: ----------- some updates to the autobuild Modified Paths: -------------- trunk/matplotlib/Makefile trunk/matplotlib/doc/faq/installing_faq.rst trunk/matplotlib/doc/index.rst trunk/matplotlib/doc/make.py trunk/matplotlib/doc/pyplots/text_commands.py trunk/matplotlib/doc/pyplots/text_layout.py trunk/matplotlib/doc/sphinxext/plot_directive.py trunk/matplotlib/lib/matplotlib/cbook.py Modified: trunk/matplotlib/Makefile =================================================================== --- trunk/matplotlib/Makefile 2008-06-13 19:23:21 UTC (rev 5518) +++ trunk/matplotlib/Makefile 2008-06-13 19:49:16 UTC (rev 5519) @@ -37,9 +37,9 @@ python setup.py install --prefix=~/dev;\ cd doc;\ rm -rf build;\ - python make.py html;\ - python make.py sf + python make.py clean html latex sf; + Modified: trunk/matplotlib/doc/faq/installing_faq.rst =================================================================== --- trunk/matplotlib/doc/faq/installing_faq.rst 2008-06-13 19:23:21 UTC (rev 5518) +++ trunk/matplotlib/doc/faq/installing_faq.rst 2008-06-13 19:49:16 UTC (rev 5519) @@ -40,6 +40,12 @@ import matplotlib print matplotlib.get_configdir() + A typical location for the config directory is :file:`.matplotlib`, and the following + caches may need to be cleared after a major update:: + + rm -rf ~/.matplotlib/tex.cache + rm -rf ~/.matplotlib/fontManager.cache + .. _what-is-a-backend: What is a backend? @@ -175,7 +181,7 @@ `sourceforge download <http://sourceforge.net/project/platformdownload.php?group_id=80706>`_ site. Choose the files that match your version of python (eg -``py2.5`` if you instaslled Python 2.5) and have the ``exe`` +``py2.5`` if you installed Python 2.5) which have the ``exe`` extension. If you haven't already installed python, you can get the official version from the `python web site <http://python.org/download/>`_. There are also two packaged Modified: trunk/matplotlib/doc/index.rst =================================================================== --- trunk/matplotlib/doc/index.rst 2008-06-13 19:23:21 UTC (rev 5518) +++ trunk/matplotlib/doc/index.rst 2008-06-13 19:49:16 UTC (rev 5519) @@ -5,6 +5,8 @@ Welcome to matplotlib's documentation! ====================================== +Download `PDF <http://matplotlib.sf.net/doc/Matplotlib.pdf>`_ + Contents: .. toctree:: @@ -22,3 +24,8 @@ * :ref:`modindex` * :ref:`search` + +.. _ipython: http://ipython.scipy.org +.. _numpy: http://numpy.scipy.org +.. _scipy: http://scipy.org +.. _vtk: http://www.vtk.org Modified: trunk/matplotlib/doc/make.py =================================================================== --- trunk/matplotlib/doc/make.py 2008-06-13 19:23:21 UTC (rev 5518) +++ trunk/matplotlib/doc/make.py 2008-06-13 19:49:16 UTC (rev 5519) @@ -17,6 +17,7 @@ def sf(): 'push a copy to the sf site' os.system('cd build; rsync -avz html jd...@ma...:/home/groups/m/ma/matplotlib/htdocs/doc/ -essh') + os.system('cd build/latex; scp Matplotlib.pdf jd...@ma...:/home/groups/m/ma/matplotlib/htdocs/doc/') def figs(): os.system('cd users/figures/ && python make.py') @@ -56,7 +57,8 @@ print 'latex build has not been tested on windows' def clean(): - shutil.rmtree('build') + if os.path.exists('build'): + shutil.rmtree('build') for fname in glob.glob('pyplots/*.png') + glob.glob('pyplots/*.pdf'): os.remove(fname) Modified: trunk/matplotlib/doc/pyplots/text_commands.py =================================================================== --- trunk/matplotlib/doc/pyplots/text_commands.py 2008-06-13 19:23:21 UTC (rev 5518) +++ trunk/matplotlib/doc/pyplots/text_commands.py 2008-06-13 19:49:16 UTC (rev 5519) @@ -5,23 +5,23 @@ fig.suptitle('bold figure suptitle', fontsize=14, fontweight='bold') ax = fig.add_subplot(111) - +fig.subplots_adjust(top=0.85) ax.set_title('axes title') ax.set_xlabel('xlabel') ax.set_ylabel('ylabel') -ax.text(5, 8, 'boxed italics text in data coords', style='italic', +ax.text(3, 8, 'boxed italics text in data coords', style='italic', bbox={'facecolor':'red', 'alpha':0.5, 'pad':10}) -ax.text(2, 6, r'an equation: $E=mc^2$', fontsize=20) +ax.text(2, 6, r'an equation: $E=mc^2$', fontsize=15) -ax.text(4, 3, unicode('unicode: Institut f\374r Festk\366rperphysik', 'latin-1')) +ax.text(3, 2, unicode('unicode: Institut f\374r Festk\366rperphysik', 'latin-1')) ax.text(0.95, 0.01, 'colored text in axes coords', verticalalignment='bottom', horizontalalignment='right', transform=ax.transAxes, - color='green', fontsize=20) + color='green', fontsize=15) ax.plot([2], [1], 'o') Modified: trunk/matplotlib/doc/pyplots/text_layout.py =================================================================== --- trunk/matplotlib/doc/pyplots/text_layout.py 2008-06-13 19:23:21 UTC (rev 5518) +++ trunk/matplotlib/doc/pyplots/text_layout.py 2008-06-13 19:49:16 UTC (rev 5519) @@ -8,7 +8,7 @@ top = bottom + height fig = plt.figure() -ax = fig.add_subplot(111) +ax = fig.add_axes([0,0,1,1]) # axes coordinates are 0,0 is bottom left and 1,1 is upper right p = patches.Rectangle( Modified: trunk/matplotlib/doc/sphinxext/plot_directive.py =================================================================== --- trunk/matplotlib/doc/sphinxext/plot_directive.py 2008-06-13 19:23:21 UTC (rev 5518) +++ trunk/matplotlib/doc/sphinxext/plot_directive.py 2008-06-13 19:49:16 UTC (rev 5519) @@ -106,7 +106,6 @@ for format, dpi in formats: outname = os.path.join(outdir, '%s.%s' % (basename, format)) plt.savefig(outname, dpi=dpi) - print ' all figures made' def run(arguments, options, state_machine, lineno): reference = directives.uri(arguments[0]) Modified: trunk/matplotlib/lib/matplotlib/cbook.py =================================================================== --- trunk/matplotlib/lib/matplotlib/cbook.py 2008-06-13 19:23:21 UTC (rev 5518) +++ trunk/matplotlib/lib/matplotlib/cbook.py 2008-06-13 19:49:16 UTC (rev 5519) @@ -1031,7 +1031,20 @@ return result +def recursive_remove(path): + if os.path.isdir(path): + for fname in glob.glob(os.path.join(path, '*')) + glob.glob(os.path.join(path, '.*')): + if os.path.isdir(fname): + recursive_remove(fname) + os.removedirs(fname) + else: + os.remove(fname) + #os.removedirs(path) + else: + os.remove(path) + + # a dict to cross-map linestyle arguments _linestyles = [('-', 'solid'), ('--', 'dashed'), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |