Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit cca0811

Browse filesBrowse files
tacaswelltacaswell
committed
merge v1.4.0-doc into 1.4.x
2 parents 71ba349 + e70c567 commit cca0811
Copy full SHA for cca0811
Expand file treeCollapse file tree

21 files changed

+72
-39
lines changed

‎INSTALL

Copy file name to clipboardExpand all lines: INSTALL
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ in addition to
7070

7171
In case Python is not installed for all users (not the default), the
7272
Microsoft Visual C++ 2008 (
73-
`64 bit <http://www.microsoft.com/download/en/details.aspx?id=15336>`_
73+
`64 bit <http://www.microsoft.com/download/en/details.aspx?id=15336>`__
7474
or
75-
`32 bit <http://www.microsoft.com/download/en/details.aspx?id=29>`_
75+
`32 bit <http://www.microsoft.com/download/en/details.aspx?id=29>`__
7676
for Python 2.6 to 3.2) or Microsoft Visual C++ 2010 (
77-
`64 bit <http://www.microsoft.com/en-us/download/details.aspx?id=14632>`_
77+
`64 bit <http://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
7878
or
79-
`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=5555>`_
79+
`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
8080
for Python 3.3 and 3.4) redistributable packages need to be installed.
8181

8282
Matplotlib depends on `Pillow <https://pypi.python.org/pypi/Pillow>`_
@@ -235,7 +235,7 @@ ImageMagick
235235
Optional dependencies
236236
^^^^^^^^^^^^^^^^^^^^^
237237

238-
`Pillow <http://python-imaging.github.io/>`_
238+
`Pillow <http://python-imaging.github.io/>`__
239239
If Pillow is installed, matplotlib can read and write a larger
240240
selection of image file formats.
241241

‎doc/_static/basemap_contour1.png

Copy file name to clipboard
232 KB
Loading

‎doc/_static/cartopy_hurricane_katrina_01_00.png

Copy file name to clipboard
82.8 KB
Loading

‎doc/api/dviread.rst

Copy file name to clipboardExpand all lines: doc/api/dviread.rst
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
****************
2+
dviread
3+
****************
14

25
:mod:`matplotlib.dviread`
36
=========================

‎doc/api/index.rst

Copy file name to clipboardExpand all lines: doc/api/index.rst
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
colorbar_api.rst
2828
colors_api.rst
2929
dates_api.rst
30+
dviread.rst
3031
figure_api.rst
3132
finance_api.rst
3233
font_manager_api.rst
@@ -48,5 +49,6 @@
4849
ticker_api.rst
4950
tight_layout_api.rst
5051
tri_api.rst
52+
type1font.rst
5153
units_api.rst
5254
widgets_api.rst

‎doc/api/type1font.rst

Copy file name to clipboardExpand all lines: doc/api/type1font.rst
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
****************
2+
type1font
3+
****************
14

25
:mod:`matplotlib.type1font`
36
===========================

‎doc/conf.py

Copy file name to clipboardExpand all lines: doc/conf.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
'sphinxext.github',
3535
'numpydoc']
3636

37+
exclude_patterns = ['api/api_changes/README.rst']
3738

3839
# Use IPython's console highlighting by default
3940
try:

‎doc/devel/gitwash/git_development.rst

Copy file name to clipboardExpand all lines: doc/devel/gitwash/git_development.rst
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ Contents:
1313
set_up_fork
1414
configure_git
1515
development_workflow
16+
dot2_dot3

‎doc/mpl_toolkits/index.rst

Copy file name to clipboardExpand all lines: doc/mpl_toolkits/index.rst
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Plots data on map projections, with continental and political
3030
boundaries, see `basemap <http://matplotlib.org/basemap>`_
3131
docs.
3232

33-
.. image:: http://matplotlib.org/basemap/_images/contour1.png
33+
.. image:: /_static/basemap_contour1.png
3434
:height: 400px
3535

3636

@@ -46,7 +46,7 @@ integration with Shapely for powerful yet easy-to-use vector data processing
4646
tools. An example plot from the
4747
`Cartopy gallery <http://scitools.org.uk/cartopy/docs/latest/gallery.html>`_:
4848

49-
.. image:: http://scitools.org.uk/cartopy/docs/latest/_images/hurricane_katrina_01_00.png
49+
.. image:: /_static/cartopy_hurricane_katrina_01_00.png
5050
:height: 400px
5151

5252

@@ -116,7 +116,7 @@ MplDataCursor
116116
toolkit written by Joe Kington to provide interactive "data cursors"
117117
(clickable annotation boxes) for matplotlib.
118118

119-
.. _prettyplotlib:
119+
.. _toolkit_prettyplotlib:
120120

121121
prettyplotlib
122122
=============
@@ -133,7 +133,7 @@ High-Level Plotting
133133
Several projects have started to provide a higher-level interface to
134134
matplotlib. These are independent projects.
135135

136-
.. _seaborn:
136+
.. _toolkit_seaborn:
137137

138138
seaborn
139139
=======
@@ -144,7 +144,7 @@ level interface for drawing statistical graphics with matplotlib. It
144144
aims to make visualization a central part of exploring and
145145
understanding complex datasets.
146146

147-
.. _ggplot:
147+
.. _toolkit_ggplot:
148148

149149
ggplot
150150
======

‎doc/users/beginner.rst

Copy file name to clipboardExpand all lines: doc/users/beginner.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _users-guide-index:
1+
.. _beginners-guide-index:
22

33
################
44
Beginner's Guide

‎doc/users/colormaps.rst

Copy file name to clipboardExpand all lines: doc/users/colormaps.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Colormaps are often split into several categories based on their function (see,
3535
Lightness of matplotlib colormaps
3636
=================================
3737

38-
Here we examine the lightness values of the matplotlib colormaps. Note that some documentation on the colormaps is available ([colormaps]_).
38+
Here we examine the lightness values of the matplotlib colormaps. Note that some documentation on the colormaps is available ([list-colormaps]_).
3939

4040
Sequential
4141
----------
@@ -100,7 +100,7 @@ References
100100

101101
.. [Ware] http://ccom.unh.edu/sites/default/files/publications/Ware_1988_CGA_Color_sequences_univariate_maps.pdf
102102
.. [Moreland] http://www.sandia.gov/~kmorel/documents/ColorMaps/ColorMapsExpanded.pdf
103-
.. [colormaps] https://gist.github.com/endolith/2719900#id7
103+
.. [list-colormaps] https://gist.github.com/endolith/2719900#id7
104104
.. [mycarta-banding] http://mycarta.wordpress.com/2012/10/14/the-rainbow-is-deadlong-live-the-rainbow-part-4-cie-lab-heated-body/
105105
.. [mycarta-jet] http://mycarta.wordpress.com/2012/10/06/the-rainbow-is-deadlong-live-the-rainbow-part-3/
106106
.. [mycarta-lablinear] http://mycarta.wordpress.com/2012/12/06/the-rainbow-is-deadlong-live-the-rainbow-part-5-cie-lab-linear-l-rainbow/

‎doc/users/configuration.rst

Copy file name to clipboardExpand all lines: doc/users/configuration.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _users-guide-index:
1+
.. _configuration-guide-index:
22

33
###################
44
Configuration Guide

‎doc/users/developer.rst

Copy file name to clipboardExpand all lines: doc/users/developer.rst
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _users-guide-index:
1+
.. _advanced-guide-index:
22

33
###############
44
Advanced Guide
@@ -18,5 +18,6 @@ Advanced Guide
1818
event_handling.rst
1919
transforms_tutorial.rst
2020
path_tutorial.rst
21+
patheffects_guide.rst
2122
recipes.rst
2223

‎doc/users/screenshots.rst

Copy file name to clipboardExpand all lines: doc/users/screenshots.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ For examples of how to embed matplotlib in different toolkits, see:
294294
* :ref:`user_interfaces-embedding_in_gtk2`
295295
* :ref:`user_interfaces-embedding_in_wx2`
296296
* :ref:`user_interfaces-mpl_with_glade`
297-
* :ref:`user_interfaces-embedding_in_qt`
297+
* :ref:`user_interfaces-embedding_in_qt4`
298298
* :ref:`user_interfaces-embedding_in_tk`
299299

300300
XKCD-style sketch plots

‎doc/users/whats_new.rst

Copy file name to clipboardExpand all lines: doc/users/whats_new.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ legends for complex plots such as :meth:`~matplotlib.pyplot.stem` plots
10841084
will now display correctly. Second, the 'best' placement of a legend has
10851085
been improved in the presence of NANs.
10861086

1087-
See :ref:`legend-complex-plots` for more detailed explanation and
1087+
See the :ref:`plotting-guide-legend` for more detailed explanation and
10881088
examples.
10891089

10901090
.. plot:: mpl_examples/pylab_examples/legend_demo4.py

‎examples/color/named_colors.py

Copy file name to clipboardExpand all lines: examples/color/named_colors.py
+32-15Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,42 @@
3838
sorted_colors = [colors_[i] for i in ind]
3939

4040
n = len(sorted_colors)
41-
ncols = 3
41+
ncols = 4
4242
nrows = int(np.ceil(1. * n / ncols))
4343

44-
fig = plt.figure(figsize=(ncols*2.5, nrows*2))
44+
fig = plt.figure()
45+
ax = fig.add_subplot(111)
46+
47+
X, Y = fig.get_dpi() * fig.get_size_inches()
48+
49+
# row height
50+
h = Y / (nrows + 1)
51+
# col width
52+
w = X / ncols
53+
4554
for i, (name, color) in enumerate(sorted_colors):
46-
ax = fig.add_subplot(nrows, ncols, i + 1)
47-
ax.text(0.55, 0.5, name, fontsize=12,
55+
col = i % ncols
56+
row = int(i / ncols)
57+
y = Y - (row * h) - h
58+
59+
xi_line = w * (col + 0.05)
60+
xf_line = w * (col + 0.25)
61+
xi_text = w * (col + 0.3)
62+
63+
ax.text(xi_text, y, name, fontsize=(h * 0.8),
4864
horizontalalignment='left',
4965
verticalalignment='center')
5066

51-
# Add extra black line a little bit thicker to make
52-
# clear colors more visible.
53-
ax.hlines(0.5, 0, 0.5, color='black', linewidth=10)
54-
ax.hlines(0.5, 0, 0.5, color=color, linewidth=8)
55-
ax.set_xlim(0, 1)
56-
ax.set_ylim(0, 1)
57-
ax.set_axis_off()
58-
59-
fig.subplots_adjust(left=0.01, right=0.99,
60-
top=0.99, bottom=0.01,
61-
hspace=1, wspace=0.1)
67+
# Add extra black line a little bit thicker to make
68+
# clear colors more visible.
69+
ax.hlines(y, xi_line, xf_line, color='black', linewidth=(h * 0.7))
70+
ax.hlines(y + h * 0.1, xi_line, xf_line, color=color, linewidth=(h * 0.6))
71+
72+
ax.set_xlim(0, X)
73+
ax.set_ylim(0, Y)
74+
ax.set_axis_off()
75+
76+
fig.subplots_adjust(left=0, right=1,
77+
top=1, bottom=0,
78+
hspace=0, wspace=0)
6279
plt.show()

‎lib/matplotlib/cbook.py

Copy file name to clipboardExpand all lines: lib/matplotlib/cbook.py
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1905,7 +1905,9 @@ def boxplot_stats(X, whis=1.5, bootstrap=None, labels=None):
19051905
Non-bootstrapping approach to confidence interval uses Gaussian-based
19061906
asymptotic approximation:
19071907
1908-
.. math:: \mathrm{med} \pm 1.57 \times \frac{\mathrm{iqr}}{\sqrt{N}}
1908+
.. math::
1909+
1910+
\mathrm{med} \pm 1.57 \\times \\frac{\mathrm{iqr}}{\sqrt{N}}
19091911
19101912
General approach from:
19111913
McGill, R., Tukey, J.W., and Larsen, W.A. (1978) "Variations of

‎lib/matplotlib/mlab.py

Copy file name to clipboardExpand all lines: lib/matplotlib/mlab.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,11 @@
7676
Return the phase (unwrapped angle) of the frequency spectrum of a signal
7777
7878
:func:`detrend_mean`
79+
Remove the mean from a line.
80+
7981
:func:`demean`
80-
Remove the mean from a line. These functions differ in their defaults.
82+
Remove the mean from a line. This function is the same as as
83+
:func:`detrend_mean` except for the default *axis*.
8184
8285
:func:`detrend_linear`
8386
Remove the best fit line from a line.

‎lib/matplotlib/patheffects.py

Copy file name to clipboardExpand all lines: lib/matplotlib/patheffects.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def __init__(self, offset=(2,-2),
227227
----------
228228
offset : pair of floats
229229
The offset of the shadow in points.
230-
shadow_rgbFace : :ref:`color <mpl-color-spec>`
230+
shadow_rgbFace : color
231231
The shadow color.
232232
alpha : float
233233
The alpha transparency of the created shadow patch.
@@ -320,7 +320,7 @@ def __init__(self, offset=(2,-2),
320320
----------
321321
offset : pair of floats
322322
The offset to apply to the path, in points.
323-
shadow_color : :ref:`color <mpl-color-spec>`
323+
shadow_color : color
324324
The shadow color. Default is black.
325325
A value of ``None`` takes the original artist's color
326326
with a scale factor of `rho`.

‎lib/matplotlib/tri/triangulation.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tri/triangulation.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class Triangulation(object):
2727
2828
Attributes
2929
----------
30-
edges
31-
neighbors
30+
`edges`
31+
`neighbors`
3232
is_delaunay : bool
3333
Whether the Triangulation is a calculated Delaunay
3434
triangulation (where `triangles` was not specified) or not.

‎lib/matplotlib/tri/tritools.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tri/tritools.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class TriAnalyzer(object):
2424
2525
Attributes
2626
----------
27-
scale_factors
27+
`scale_factors`
2828
2929
"""
3030
def __init__(self, triangulation):

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.