Skip to content

Commit f2d8547

Browse files
mdboommdboom
committed
Merge remote-tracking branch 'main/master'
Conflicts: lib/matplotlib/backends/backend_gtk.py lib/matplotlib/backends/backend_ps.py lib/matplotlib/backends/backend_svg.py lib/matplotlib/testing/compare.py lib/matplotlib/testing/decorators.py lib/matplotlib/tests/baseline_images/test_axes/markevery.png lib/matplotlib/tests/baseline_images/test_axes/markevery.svg lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg lib/matplotlib/tests/baseline_images/test_axes/polar_units_2.png lib/matplotlib/tests/test_backend_svg.py lib/matplotlib/tests/test_image.py lib/mpl_toolkits/axes_grid1/axes_divider.py setupext.py src/_path.cpp src/ft2font.cpp src/ft2font.h
2 parents 267c3cb + 795e700 commit f2d8547

File tree

1,100 files changed

+209707
-67388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,100 files changed

+209707
-67388
lines changed

‎INSTALL

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ way depends on what operating system you are using, what you already
77
have installed, and how you want to use it. To avoid wading through
88
all the details (and potential complications) on this page, the
99
easiest thing for you to do is use one of the pre-packaged python
10-
distributions that already provide matplotlib built in. The Enthought
10+
distributions that already provide matplotlib built-in. The Enthought
1111
Python Distribution `(EPD)
1212
<http://www.enthought.com/products/epd.php>`_ for Windows, OS X or
1313
Redhat is an excellent choice that "just works" out of the box.
1414
Another excellent alternative for Windows users is `Python (x, y)
1515
<http://www.pythonxy.com/foreword.php>`_ which tends to be updated a
1616
bit more frequently. Both of these packages include matplotlib and
1717
pylab, and *lots* of other useful tools. matplotlib is also packaged
18-
for pretty much every major linux distribution, so if you are on linux
18+
for almost every major linux distribution. So if you are on linux,
1919
your package manager will probably provide matplotlib prebuilt.
2020

2121
One single click installer and you are done.
@@ -32,7 +32,7 @@ but OS X users please read :ref:`which-python-for-osx`.
3232

3333
Once you have python up and running, you will need to install `numpy
3434
<http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`_.
35-
numpy provides high performance array data structures and mathematical
35+
numpy provides high-performance array data structures and mathematical
3636
functions, and is a requirement for matplotlib. You can test your
3737
progress::
3838

@@ -42,18 +42,18 @@ progress::
4242
matplotlib requires numpy version 1.1 or later. Although it is not a
4343
requirement to use matplotlib, we strongly encourage you to install
4444
`ipython <http://ipython.scipy.org/dist>`_, which is an interactive
45-
shell for python that is matplotlib aware.
45+
shell for python that is matplotlib-aware.
4646

47-
Next we need to get matplotlib installed. We provide prebuilt
47+
Next, we need to get matplotlib installed. We provide prebuilt
4848
binaries for OS X and Windows on the matplotlib `download
4949
<http://sourceforge.net/projects/matplotlib/files/>`_ page. Click on
5050
the latest release of the "matplotlib" package, choose your python
51-
version (2.5 or 2.6) and your platform (macosx or win32) and you
51+
version (2.6, 2.7 or 3.2) and your platform (macosx or win32) and you
5252
should be good to go. If you have any problems, please check the
5353
:ref:`installing-faq`, google around a little bit, and post a question
5454
the `mailing list
5555
<http://sourceforge.net/project/showfiles.php?group_id=80706>`_. If
56-
you are on debian/unbuntu linux, it suffices to do::
56+
you are on debian/ubuntu linux, it suffices to do::
5757

5858
> sudo apt-get install python-matplotlib
5959

@@ -77,9 +77,6 @@ and running quickly::
7777

7878
In [2]: hist(x, 100)
7979

80-
Instructions for installing our OSX binaries are found in the FAQ
81-
ref:`install_osx_binaries`.
82-
8380
Note that when testing matplotlib installations from the interactive
8481
python console, there are some issues relating to user interface
8582
toolkits and interactive settings that are discussed in
@@ -115,8 +112,8 @@ distribution, download the zip file and look in the examples subdir.
115112
Installing from source
116113
======================
117114

118-
If you are interested perhaps in contributing to matplotlib
119-
development, running the latest greatest code, or just like to
115+
If you are interested in contributing to matplotlib
116+
development, running the latest source code, or just like to
120117
build everything yourself, it is not difficult to build matplotlib
121118
from source. Grab the latest *tar.gz* release file from `sourceforge
122119
<http://sourceforge.net/project/showfiles.php?group_id=80706>`_, or if
@@ -140,7 +137,7 @@ installed, and so on. This file will be particularly useful to those
140137
packaging matplotlib.
141138

142139
If you have installed prerequisites to nonstandard places and need to
143-
inform matplotlib where they are, edit ``setupext.py`` an add the base
140+
inform matplotlib where they are, edit ``setupext.py`` and add the base
144141
dirs to the ``basedir`` dictionary entry for your ``sys.platform``.
145142
e.g., if the header to some required library is in
146143
``/some/path/include/someheader.h``, put ``/some/path`` in the
@@ -165,17 +162,17 @@ libraries themselves.
165162
If you are on debian/ubuntu, you can get all the dependencies
166163
required to build matplotlib with::
167164

168-
sudo apt-get build_dep python-matplotlib
169-
170-
This does not build matplotlib, but it does get the install the
171-
build dependencies, which will make building from svn easy.
165+
sudo apt-get build-dep python-matplotlib
172166

173167
If you are on Fedora/RedHat, you can get all the dependencies
174168
required to build matplotlib by first installing ``yum-builddep``
175169
and then running::
176170

177171
su -c "yum-builddep python-matplotlib"
178172

173+
This does not build matplotlib, but it does get the install the
174+
build dependencies, which will make building from source easier.
175+
179176
:term:`python` 2.4 (or later but not python3)
180177
matplotlib requires python 2.4 or later (`download <http://www.python.org/download/>`__)
181178

@@ -216,7 +213,7 @@ backends and the capabilities they provide
216213

217214
:term:`wxpython` 2.8 or later
218215
The python wrappers for the wx widgets library for use with the
219-
WX backend
216+
WX or WXAgg backend
220217

221218
:term:`pyfltk` 1.0 or later
222219
The python wrappers of the FLTK widgets library for use with FLTKAgg

‎doc/_templates/indexsidebar.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h3>News</h3>
55
to support matplotlib development.</p>
66

77

8-
<p>matplotlib 1.0.0 is available for <a href="https://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-1.0/">download</a>. See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
8+
<p>matplotlib 1.0.1 is available for <a href="https://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-1.0.1/">download</a>. See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
99
pathto('users/installing') }}">installing</a>
1010
</p>
1111

@@ -64,7 +64,7 @@ <h3>Need help?</h3>
6464
but it is a good idea to ping us on the mailing list too.</p>
6565

6666
<p>For details on what's new, see the detailed <a href="{{
67-
pathto('_static/CHANGELOG', 1) }}">changelog</a> or browse the <a href="https://github.com/matplotlib/matplotlib.git">source code</a>. Anything that could
67+
pathto('_static/CHANGELOG', 1) }}">changelog</a> or browse the <a href="https://github.com/matplotlib/matplotlib">source code</a>. Anything that could
6868
require changes to your existing codes is logged in the <a href="{{
6969
pathto('api/api_changes.html', 1) }}">api changes</a> file.</p>
7070

‎doc/api/afm_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
**************
2-
matplotlib afm
3-
**************
1+
**********************************
2+
afm (Adobe Font Metrics interface)
3+
**********************************
44

55

66
:mod:`matplotlib.afm`

‎doc/api/artist_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.. _artist-api:
22

3-
*******************
4-
matplotlib artists
5-
*******************
3+
*******
4+
artists
5+
*******
66

77
.. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text
88
:parts: 2

‎doc/api/axes_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
***************
2-
matplotlib axes
3-
***************
1+
****
2+
axes
3+
****
44

55

66
:mod:`matplotlib.axes`

‎doc/api/axis_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
***************
2-
matplotlib axis
3-
***************
1+
****
2+
axis
3+
****
44

55

66
:mod:`matplotlib.axis`

‎doc/api/cbook_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
****************
2-
matplotlib cbook
3-
****************
1+
*****
2+
cbook
3+
*****
44

55

66
:mod:`matplotlib.cbook`

‎doc/api/cm_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*************
2-
matplotlib cm
2+
cm (colormap)
33
*************
44

55

‎doc/api/collections_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
**********************
2-
matplotlib collections
3-
**********************
1+
***********
2+
collections
3+
***********
44

55
.. inheritance-diagram:: matplotlib.collections
66
:parts: 2

‎doc/api/colorbar_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*******************
2-
matplotlib colorbar
3-
*******************
1+
********
2+
colorbar
3+
********
44

55

66
:mod:`matplotlib.colorbar`

‎doc/api/colors_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*****************
2-
matplotlib colors
3-
*****************
1+
******
2+
colors
3+
******
44

55

66
:mod:`matplotlib.colors`

‎doc/api/dates_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
****************
2-
matplotlib dates
3-
****************
1+
*****
2+
dates
3+
*****
44

55
.. inheritance-diagram:: matplotlib.dates
66
:parts: 1

‎doc/api/figure_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*****************
2-
matplotlib figure
3-
*****************
1+
******
2+
figure
3+
******
44

55

66
:mod:`matplotlib.figure`

‎doc/api/font_manager_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
***********************
2-
matplotlib font_manager
3-
***********************
1+
************
2+
font_manager
3+
************
44

55
:mod:`matplotlib.font_manager`
66
==============================

‎doc/api/gridspec_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*******************
2-
matplotlib gridspec
3-
*******************
1+
********
2+
gridspec
3+
********
44

55

66
:mod:`matplotlib.gridspec`

‎doc/api/index.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
:Date: |today|
1111

1212
.. toctree::
13+
:maxdepth: 1
1314

1415
api_changes.rst
1516
matplotlib_configuration_api.rst
@@ -31,7 +32,8 @@
3132
path_api.rst
3233
pyplot_api.rst
3334
nxutils_api.rst
34-
spine_api.rst
35+
spines_api.rst
3536
ticker_api.rst
3637
units_api.rst
3738
index_backend_api.rst
39+
widgets_api.rst

‎doc/api/index_backend_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*******************
2-
matplotlib backends
3-
*******************
1+
********
2+
backends
3+
********
44

55
.. toctree::
66

‎doc/api/mathtext_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*******************
2-
matplotlib mathtext
3-
*******************
1+
********
2+
mathtext
3+
********
44

55
.. inheritance-diagram:: matplotlib.mathtext
66
:parts: 1

‎doc/api/matplotlib_configuration_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
************************
2-
matplotlib configuration
3-
************************
1+
*************
2+
configuration
3+
*************
44

55

66
:mod:`matplotlib`

‎doc/api/mlab_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
****************
2-
matplotlib mlab
3-
****************
1+
****
2+
mlab
3+
****
44

55

66
:mod:`matplotlib.mlab`

‎doc/api/nxutils_api.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
2-
*******************
3-
matplotlib nxutils
4-
*******************
1+
*******
2+
nxutils
3+
*******
54

65
:mod:`matplotlib.nxutils`
76
===========================
87

98
.. automodule:: matplotlib.nxutils
9+
:members:
10+
:undoc-members:
11+
:show-inheritance:
12+

‎doc/api/path_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
***************
2-
matplotlib path
3-
***************
1+
****
2+
path
3+
****
44

55

66
:mod:`matplotlib.path`

‎doc/api/pyplot_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*****************
2-
matplotlib pyplot
3-
*****************
1+
******
2+
pyplot
3+
******
44

55

66
:mod:`matplotlib.pyplot`

‎doc/api/spine_api.rst renamed to ‎doc/api/spines_api.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
*****************
2-
matplotlib spine
3-
*****************
1+
******
2+
spines
3+
******
44

55

6-
:mod:`matplotlib.spine`
6+
:mod:`matplotlib.spines`
77
========================
88

99
.. automodule:: matplotlib.spines

‎doc/api/ticker_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*******************
2-
matplotlib ticker
3-
*******************
1+
******
2+
ticker
3+
******
44

55

66
:mod:`matplotlib.ticker`

‎doc/api/units_api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
*****************
2-
matplotlib units
3-
*****************
1+
*****
2+
units
3+
*****
44

55

66
:mod:`matplotlib.units`

‎doc/api/widgets_api.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
*******
2+
widgets
3+
*******
4+
5+
6+
:mod:`matplotlib.widgets`
7+
=========================
8+
9+
.. automodule:: matplotlib.widgets
10+
:members:
11+
:undoc-members:
12+
:show-inheritance:

0 commit comments

Comments
 (0)