Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 25303ee

Browse files
SidharthBansalSidharthBansal
committed
Merge branch 'master' of https://github.com/matplotlib/matplotlib into file_name_made_more_understandable
2 parents 91920e4 + 348e9fe commit 25303ee

15 files changed

Lines changed: 353 additions & 620 deletions

File tree

‎azure-pipelines.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,7 @@ steps:
120120
testResultsFiles: '**/test-results.xml'
121121
testRunTitle: 'Python $(python.version)'
122122
condition: succeededOrFailed()
123+
124+
- publish: $(System.DefaultWorkingDirectory)/result_images
125+
artifact: $(Agent.JobName)-result_images
126+
condition: and(failed(), ne(variables['python.version'], 'Pre'))

‎doc/api/api_changes_3.3/deprecations.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,3 +422,7 @@ Setting the *orientation* of an ``eventplot()`` or `.EventCollection` to "none"
422422
or None is deprecated; set it to "horizontal" instead. Moreover, the two
423423
orientations ("horizontal" and "vertical") will become case-sensitive in the
424424
future.
425+
426+
*minor* kwarg to `.Axis.get_ticklocs` will become keyword-only
427+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
428+
Passing this argument positionally is deprecated.

‎doc/conf.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ def _check_dependencies():
102102
else:
103103
autodoc_default_options = {'members': None, 'undoc-members': None}
104104

105-
nitpicky = True
105+
# missing-references names matches sphinx>=3 behavior, so we can't be nitpicky
106+
# for older sphinxes.
107+
nitpicky = sphinx.version_info >= (3,)
106108
# change this to True to update the allowed failures
107109
missing_references_write_json = False
108110
missing_references_warn_unused_ignores = False

‎doc/devel/documenting_mpl.rst‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,14 @@ Other packages can also be linked via
289289
`numpy.mean`
290290
291291
will return this link: `numpy.mean`. This works for Python, Numpy, Scipy,
292-
and Pandas (full list is in :file:`doc/conf.py`). Sometimes it is tricky
293-
to get external Sphinx linking to work; to
294-
check that a something exists to link to the following shell command outputs
295-
a list of all objects that can be referenced (in this case for Numpy)::
292+
and Pandas (full list is in :file:`doc/conf.py`). If external linking fails,
293+
you can check the full list of referenceable objects with the following
294+
commands::
296295

296+
python -m sphinx.ext.intersphinx 'https://docs.python.org/3/objects.inv'
297297
python -m sphinx.ext.intersphinx 'https://docs.scipy.org/doc/numpy/objects.inv'
298+
python -m sphinx.ext.intersphinx 'https://docs.scipy.org/doc/scipy/reference/objects.inv'
299+
python -m sphinx.ext.intersphinx 'https://pandas.pydata.org/pandas-docs/stable/objects.inv'
298300

299301
.. _rst-figures-and-includes:
300302

‎doc/missing-references.json‎

Lines changed: 88 additions & 146 deletions
Large diffs are not rendered by default.

‎lib/matplotlib/_pylab_helpers.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ def destroy(cls, num):
5757
manager = num
5858
if cls.figs.get(manager.num) is manager:
5959
cls.figs.pop(manager.num)
60+
else:
61+
return
6062
else:
6163
try:
6264
manager = cls.figs.pop(num)

‎lib/matplotlib/axes/_axes.py‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5326,10 +5326,18 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
53265326
Display data as an image; i.e. on a 2D regular raster.
53275327
53285328
The input may either be actual RGB(A) data, or 2D scalar data, which
5329-
will be rendered as a pseudocolor image. Note: For actually displaying
5330-
a grayscale image set up the color mapping using the parameters
5329+
will be rendered as a pseudocolor image. For displaying a grayscale
5330+
image set up the color mapping using the parameters
53315331
``cmap='gray', vmin=0, vmax=255``.
53325332
5333+
The number of pixels used to render an image is set by the axes size
5334+
and the *dpi* of the figure. This can lead to aliasing artifacts when
5335+
the image is resampled because the displayed image size will usually
5336+
not match the size of *X* (see
5337+
:doc:`/gallery/images_contours_and_fields/image_antialiasing`).
5338+
The resampling can be controlled via the *interpolation* parameter
5339+
and/or :rc:`image.interpolation`.
5340+
53335341
Parameters
53345342
----------
53355343
X : array-like or PIL image
@@ -5459,7 +5467,7 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
54595467
The filter radius for filters that have a radius parameter, i.e.
54605468
when interpolation is one of: 'sinc', 'lanczos' or 'blackman'.
54615469
5462-
resample : bool, optional
5470+
resample : bool, default: :rc:`image.resample`
54635471
When *True*, use a full resampling method. When *False*, only
54645472
resample when the output image is larger than the input image.
54655473

0 commit comments

Comments
 (0)