Skip to content

Commit 1f8cbbd

Browse files
committed
some updates to the autobuild
svn path=/trunk/matplotlib/; revision=5519
1 parent f8e1599 commit 1f8cbbd

File tree

8 files changed

+38
-11
lines changed

8 files changed

+38
-11
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jdh_doc_snapshot:
3737
python setup.py install --prefix=~/dev;\
3838
cd doc;\
3939
rm -rf build;\
40-
python make.py html;\
41-
python make.py sf
40+
python make.py clean html latex sf;
41+
4242

4343

4444

doc/faq/installing_faq.rst

+7-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ install directory. To cleanly rebuild:
4040
import matplotlib
4141
print matplotlib.get_configdir()
4242

43+
A typical location for the config directory is :file:`.matplotlib`, and the following
44+
caches may need to be cleared after a major update::
45+
46+
rm -rf ~/.matplotlib/tex.cache
47+
rm -rf ~/.matplotlib/fontManager.cache
48+
4349
.. _what-is-a-backend:
4450

4551
What is a backend?
@@ -175,7 +181,7 @@ matplotlib binary installers for windows -- you can get these from the
175181
`sourceforge download
176182
<http://sourceforge.net/project/platformdownload.php?group_id=80706>`_
177183
site. Choose the files that match your version of python (eg
178-
``py2.5`` if you instaslled Python 2.5) and have the ``exe``
184+
``py2.5`` if you installed Python 2.5) which have the ``exe``
179185
extension. If you haven't already installed python, you can get the
180186
official version from the `python web site
181187
<http://python.org/download/>`_. There are also two packaged

doc/index.rst

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
Welcome to matplotlib's documentation!
66
======================================
77

8+
Download `PDF <http://matplotlib.sf.net/doc/Matplotlib.pdf>`_
9+
810
Contents:
911

1012
.. toctree::
@@ -22,3 +24,8 @@ Indices and tables
2224
* :ref:`modindex`
2325
* :ref:`search`
2426

27+
28+
.. _ipython: http://ipython.scipy.org
29+
.. _numpy: http://numpy.scipy.org
30+
.. _scipy: http://scipy.org
31+
.. _vtk: http://www.vtk.org

doc/make.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ def check_build():
1717
def sf():
1818
'push a copy to the sf site'
1919
os.system('cd build; rsync -avz html jdh2358@matplotlib.sf.net:/home/groups/m/ma/matplotlib/htdocs/doc/ -essh')
20+
os.system('cd build/latex; scp Matplotlib.pdf jdh2358@matplotlib.sf.net:/home/groups/m/ma/matplotlib/htdocs/doc/')
2021

2122
def figs():
2223
os.system('cd users/figures/ && python make.py')
@@ -56,7 +57,8 @@ def latex():
5657
print 'latex build has not been tested on windows'
5758

5859
def clean():
59-
shutil.rmtree('build')
60+
if os.path.exists('build'):
61+
shutil.rmtree('build')
6062
for fname in glob.glob('pyplots/*.png') + glob.glob('pyplots/*.pdf'):
6163
os.remove(fname)
6264

doc/pyplots/text_commands.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
fig.suptitle('bold figure suptitle', fontsize=14, fontweight='bold')
66

77
ax = fig.add_subplot(111)
8-
8+
fig.subplots_adjust(top=0.85)
99
ax.set_title('axes title')
1010

1111
ax.set_xlabel('xlabel')
1212
ax.set_ylabel('ylabel')
1313

14-
ax.text(5, 8, 'boxed italics text in data coords', style='italic',
14+
ax.text(3, 8, 'boxed italics text in data coords', style='italic',
1515
bbox={'facecolor':'red', 'alpha':0.5, 'pad':10})
1616

17-
ax.text(2, 6, r'an equation: $E=mc^2$', fontsize=20)
17+
ax.text(2, 6, r'an equation: $E=mc^2$', fontsize=15)
1818

19-
ax.text(4, 3, unicode('unicode: Institut f\374r Festk\366rperphysik', 'latin-1'))
19+
ax.text(3, 2, unicode('unicode: Institut f\374r Festk\366rperphysik', 'latin-1'))
2020

2121
ax.text(0.95, 0.01, 'colored text in axes coords',
2222
verticalalignment='bottom', horizontalalignment='right',
2323
transform=ax.transAxes,
24-
color='green', fontsize=20)
24+
color='green', fontsize=15)
2525

2626

2727
ax.plot([2], [1], 'o')

doc/pyplots/text_layout.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
top = bottom + height
99

1010
fig = plt.figure()
11-
ax = fig.add_subplot(111)
11+
ax = fig.add_axes([0,0,1,1])
1212

1313
# axes coordinates are 0,0 is bottom left and 1,1 is upper right
1414
p = patches.Rectangle(

doc/sphinxext/plot_directive.py

-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ def makefig(fullpath, outdir):
106106
for format, dpi in formats:
107107
outname = os.path.join(outdir, '%s.%s' % (basename, format))
108108
plt.savefig(outname, dpi=dpi)
109-
print ' all figures made'
110109

111110
def run(arguments, options, state_machine, lineno):
112111
reference = directives.uri(arguments[0])

lib/matplotlib/cbook.py

+13
Original file line numberDiff line numberDiff line change
@@ -1031,6 +1031,19 @@ def simple_linear_interpolation(a, steps):
10311031

10321032
return result
10331033

1034+
def recursive_remove(path):
1035+
if os.path.isdir(path):
1036+
for fname in glob.glob(os.path.join(path, '*')) + glob.glob(os.path.join(path, '.*')):
1037+
if os.path.isdir(fname):
1038+
recursive_remove(fname)
1039+
os.removedirs(fname)
1040+
else:
1041+
os.remove(fname)
1042+
#os.removedirs(path)
1043+
else:
1044+
os.remove(path)
1045+
1046+
10341047

10351048
# a dict to cross-map linestyle arguments
10361049
_linestyles = [('-', 'solid'),

0 commit comments

Comments
 (0)