Skip to content

Commit fe02c3b

Browse files
QuLogicQuLogic
committed
Merge branch 'v3.2.x'
2 parents 757fb24 + fa773f6 commit fe02c3b

File tree

19 files changed

+1546
-882
lines changed

19 files changed

+1546
-882
lines changed

‎README.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ Start at the `contributing guide <https://matplotlib.org/devdocs/devel/contribut
8181

8282
Contact
8383
=======
84+
8485
`Discourse <https://discourse.matplotlib.org/>`_ is the discussion forum for general questions and discussions and our recommended starting point.
8586

8687
Our active mailing lists (which are mirrored on Discourse) are:

‎azure-pipelines.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ steps:
5656
condition: and(succeeded(), eq(variables['python.version'], 'Pre'))
5757

5858
- bash: |
59+
set -e
5960
case "$(python -c 'import sys; print(sys.platform)')" in
6061
linux)
6162
sudo apt-get update

‎doc/api/matplotlib_configuration_api.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ Default values and styling
4545

4646
.. autofunction:: matplotlib_fname
4747

48+
.. autofunction:: get_data_path
49+
4850
Logging
4951
=======
5052

‎doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,11 @@ resampling the data in A for display (or saving to file) *if* the upsample
218218
rate is less than a factor of three, and not an integer; downsampled data is
219219
always smoothed at resampling.
220220

221-
To get the old behavior, set :rc:`interpolation` to the old default "nearest"
221+
To get the old behavior, set :rc:`image.interpolation` to the old default "nearest"
222222
(or specify the ``interpolation`` kwarg of `.Axes.imshow`)
223223

224224
To always get the anti-aliasing behavior, no matter what the up/down sample
225-
rate, set :rc:`interpolation` to "hanning" (or one of the other filters
225+
rate, set :rc:`image.interpolation` to "hanning" (or one of the other filters
226226
available).
227227

228228
Note that the "hanning" filter was chosen because it has only a modest
@@ -307,3 +307,14 @@ mplot3d auto-registration
307307
longer necessary to import mplot3d to create 3d axes with ::
308308

309309
ax = fig.add_subplot(111, projection="3d")
310+
311+
`.SymLogNorm` now has a *base* parameter
312+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
313+
314+
Previously, `.SymLogNorm` had no *base* keyword argument and the base was
315+
hard-coded to ``base=np.e``. This was inconsistent with the default behavior of
316+
`.SymmetricalLogScale` (which defaults to ``base=10``) and the use of the word
317+
"decade" in the documentation.
318+
319+
In preparation for changing the default base to 10, calling `.SymLogNorm`
320+
without the new *base* keyword argument emits a deprecation warning.

‎doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,11 @@ deprecated. Use an explicit list instead.
231231

232232
Scales
233233
~~~~~~
234-
Passing unsupported keyword arguments to `.ScaleBase` and its subclasses
235-
`.LinearScale`, and `.SymmetricalLogScale` is deprecated and will raise a `TypeError` in 3.3.
234+
Passing unsupported keyword arguments to `.ScaleBase`, and its subclasses
235+
`.LinearScale` and `.SymmetricalLogScale`, is deprecated and will raise a
236+
`TypeError` in 3.3.
236237

237-
If extra kwargs are passed to `.LogScale`, `TypeError` will now be
238+
If extra keyword arguments are passed to `.LogScale`, `TypeError` will now be
238239
raised instead of `ValueError`.
239240

240241
Testing
@@ -289,3 +290,10 @@ from the public API in future versions.
289290

290291
``style.core.is_style_file`` and ``style.core.iter_style_files``
291292
are deprecated.
293+
294+
The ``datapath`` rcParam
295+
~~~~~~~~~~~~~~~~~~~~~~~~
296+
Use `.get_data_path` instead. (The rcParam is deprecated because it cannot be
297+
meaningfully set by an end user.) The rcParam had no effect from 3.2.0, but
298+
was deprecated only in 3.2.1. In 3.2.1+ if ``'datapath'`` is set in a
299+
``matplotlibrc`` file it will be respected, but this behavior will be removed in 3.3.

‎doc/citing.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ pp. 90-95, 2007 <https://doi.org/10.1109/MCSE.2007.55>`_.
2727
2828
DOIs
2929
----
30+
v3.2.1
31+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3714460.svg
32+
:target: https://doi.org/10.5281/zenodo.3714460
33+
v3.2.0
34+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3695547.svg
35+
:target: https://doi.org/10.5281/zenodo.3695547
36+
v3.1.3
37+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3633844.svg
38+
:target: https://doi.org/10.5281/zenodo.3633844
3039
v3.1.2
3140
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3563226.svg
3241
:target: https://doi.org/10.5281/zenodo.3563226
@@ -45,6 +54,9 @@ v3.0.2
4554
v3.0.1
4655
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1482098.svg
4756
:target: https://doi.org/10.5281/zenodo.1482098
57+
v2.2.5
58+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3633833.svg
59+
:target: https://doi.org/10.5281/zenodo.3633833
4860
v3.0.0
4961
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1420605.svg
5062
:target: https://doi.org/10.5281/zenodo.1420605

‎doc/devel/documenting_mpl.rst‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ General file structure
1919
----------------------
2020

2121
All documentation is built from the :file:`doc/`, :file:`tutorials/`, and
22-
:file:`examples/` directories. The :file:`doc/` directory contains configuration files for Sphinx
23-
and reStructuredText (ReST_; ``.rst``) files that are rendered to documentation pages.
22+
:file:`examples/` directories. The :file:`doc/` directory contains
23+
configuration files for Sphinx and reStructuredText (ReST_; ``.rst``) files
24+
that are rendered to documentation pages.
2425

2526

2627
The main entry point is :file:`doc/index.rst`, which pulls in the
@@ -41,7 +42,7 @@ documentation built into their comments.
4142

4243
.. note::
4344

44-
Don't directly edit the ``.rst`` files in :file:`doc/gallery`,
45+
Don't directly edit the ``.rst`` files in :file:`doc/gallery`,
4546
:file:`doc/tutorials`, and :file:`doc/api` (excepting
4647
:file:`doc/api/api_changes/`). Sphinx_ regenerates files in these
4748
directories when building documentation.

‎doc/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Open source
197197
Matplotlib is a Sponsored Project of NumFOCUS, a 501(c)(3) nonprofit
198198
charity in the United States. NumFOCUS provides Matplotlib with
199199
fiscal, legal, and administrative support to help ensure the health
200-
and sustainability of the project. Visit `numfocus.org <nf>`_ for more
200+
and sustainability of the project. Visit `numfocus.org <nf_>`_ for more
201201
information.
202202

203203
Donations to Matplotlib are managed by NumFOCUS. For donors in the

0 commit comments

Comments
 (0)