8000 Merge remote-tracking branch 'upstream/master' · matplotlib/matplotlib@b2ca609 · GitHub
[go: up one dir, main page]

Skip to content

Commit b2ca609

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 109f252 + 4208a71 commit b2ca609

File tree

81 files changed

+721
-819
lines changed

Some content is hidden

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

81 files changed

+721
-819
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
Added support for RGB(A) images in pcolorfast
22
`````````````````````````````````````````````
33

4-
pcolorfast now accepts 3D images (RGB or RGBA) arrays if the X and Y
5-
specifications allow image or pcolorimage rendering; they remain unsupported by
6-
the more general quadmesh rendering
4+
pcolorfast now accepts 3D images (RGB or RGBA) arrays.

doc/api/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Modules
5555
patheffects_api.rst
5656
pyplot_summary.rst
5757
projections_api.rst
58+
quiver_api.rst
5859
rcsetup_api.rst
5960
sankey_api.rst
6061
scale_api.rst
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Deprecations
2+
````````````
3+
4+
Setting ``Axis.major.locator``, ``Axis.minor.locator``, ``Axis.major.formatter``
5+
or ``Axis.minor.formatter`` to an object that is not a subclass of `Locator` or
6+
`Formatter` (respectively) is deprecated. Note that these attributes should
7+
usually be set using `Axis.set_major_locator`, `Axis.set_minor_locator`, etc.
8+
which already raise an exception when an object of the wrong class is passed.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Deprecations
2+
````````````
3+
4+
``quiver.QuiverKey.quiverkey_doc`` is deprecated; use
5+
``quiver.QuiverKey.__init__.__doc__`` instead.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Deprecations
2+
````````````
3+
4+
Returning a factor equal to None from axisartist Locators (which are **not**
5+
the same as "standard" tick Locators), or passing a factor equal to None
6+
to axisartist Formatters (which are **not** the same as "standard" tick
7+
Formatters) is deprecated. Pass a factor equal to 1 instead.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Deprecations
2+
````````````
3+
4+
``mlab.apply_window`` and ``mlab.stride_repeat`` are deprecated.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Deprecations
2+
````````````
3+
4+
``matplotlib.get_home`` is deprecated (use e.g. ``os.path.expanduser("~")``)
5+
instead.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Deprecations
2+
````````````
3+
``matplotlib.compare_versions`` is deprecated (use comparison of
4+
``distutils.version.LooseVersion``\s instead).

doc/api/prev_api_changes/api_changes_3.1.0.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -938,10 +938,6 @@ classes, whose constructors take a *base* argument.
938938
Locators / Formatters
939939
~~~~~~~~~~~~~~~~~~~~~
940940

941-
- `matplotlib.ticker.MaxNLocator.default_params` class variable
942-
943-
The defaults are not supposed to be user-configurable.
944-
945941
- ``OldScalarFormatter.pprint_val``
946942
- ``ScalarFormatter.pprint_val``
947943
- ``LogFormatter.pprint_val``

doc/api/quiver_api.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
*********************
2+
``matplotlib.quiver``
3+
*********************
4+
5+
.. currentmodule:: matplotlib.quiver
6+
7+
.. automodule:: matplotlib.quiver
8+
:no-members:
9+
:no-inherited-members:
10+
11+
Classes
12+
-------
13+
14+
.. autosummary::
15+
:toctree: _as_gen/
16+
:template: autosummary.rst
17+
18+
Quiver
19+
QuiverKey
20+
Barbs

0 commit comments

Comments
 (0)
0