Skip to content

Commit d1c0bcd

Browse files
authored
Merge branch 'matplotlib:main' into axes-bar-unit-test-for-issue-26864
2 parents 3402631 + fcd5bb1 commit d1c0bcd

Some content is hidden

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

50 files changed

+634
-349
lines changed

doc/api/figure_api.rst

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
:no-members:
99
:no-undoc-members:
1010

11-
The Figure class
12-
================
11+
Figure
12+
======
13+
14+
Figure class
15+
------------
1316
.. autosummary::
1417
:toctree: _as_gen
1518
:template: autosummary_class_only.rst
@@ -19,7 +22,7 @@ The Figure class
1922

2023

2124
Adding Axes and SubFigures
22-
==========================
25+
--------------------------
2326

2427
.. autosummary::
2528
:toctree: _as_gen
@@ -38,7 +41,7 @@ Adding Axes and SubFigures
3841
Figure.add_subfigure
3942

4043
Saving
41-
======
44+
------
4245

4346
.. autosummary::
4447
:toctree: _as_gen
@@ -49,7 +52,7 @@ Saving
4952

5053

5154
Annotating
52-
==========
55+
----------
5356

5457
.. autosummary::
5558
:toctree: _as_gen
@@ -72,7 +75,7 @@ Annotating
7275

7376

7477
Figure geometry
75-
===============
78+
---------------
7679

7780
.. autosummary::
7881
:toctree: _as_gen
@@ -90,7 +93,7 @@ Figure geometry
9093
Figure.set_dpi
9194

9295
Subplot layout
93-
==============
96+
--------------
9497

9598
.. autosummary::
9699
:toctree: _as_gen
@@ -102,7 +105,7 @@ Subplot layout
102105
Figure.get_layout_engine
103106

104107
Discouraged or deprecated
105-
-------------------------
108+
^^^^^^^^^^^^^^^^^^^^^^^^^
106109

107110
.. autosummary::
108111
:toctree: _as_gen
@@ -118,7 +121,7 @@ Discouraged or deprecated
118121
Figure.get_constrained_layout_pads
119122

120123
Interactive
121-
===========
124+
-----------
122125

123126
.. seealso::
124127

@@ -135,7 +138,7 @@ Interactive
135138
Figure.pick
136139

137140
Modifying appearance
138-
====================
141+
--------------------
139142

140143
.. autosummary::
141144
:toctree: _as_gen
@@ -152,7 +155,7 @@ Modifying appearance
152155
Figure.get_edgecolor
153156

154157
Adding and getting Artists
155-
==========================
158+
--------------------------
156159

157160
.. autosummary::
158161
:toctree: _as_gen
@@ -164,7 +167,7 @@ Adding and getting Artists
164167
Figure.figimage
165168

166169
Getting and modifying state
167-
===========================
170+
---------------------------
168171

169172
.. seealso::
170173

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*loc* parameter of ``Cell`` doesn't accept ``None`` anymore
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
The default value of the *loc* parameter has been changed from ``None`` to ``right``,
5+
which already was the default location. The behavior of `.Cell` didn't change when
6+
called without an explicit *loc* parameter.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
*nth_coord* parameter to axisartist helpers for fixed axis
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
Helper APIs in `.axisartist` for generating a "fixed" axis on rectilinear axes
4+
(`.FixedAxisArtistHelperRectilinear`) no longer take a *nth_coord* parameter,
5+
as that parameter is entirely inferred from the (required) *loc* parameter and
6+
having inconsistent *nth_coord* and *loc* is an error.
7+
8+
For curvilinear axes, the *nth_coord* parameter remains supported (it affects
9+
the *ticks*, not the axis position itself), but that parameter will become
10+
keyword-only, for consistency with the rectilinear case.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
``passthru_pt``
2+
~~~~~~~~~~~~~~~
3+
4+
This attribute of ``AxisArtistHelper``\s has been removed.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Inconsistent *nth_coord* and *loc* passed to ``_FixedAxisArtistHelperBase``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
The value of the *nth_coord* parameter of ``_FixedAxisArtistHelperBase`` and
4+
its subclasses is now inferred from the value of *loc*; passing inconsistent
5+
values (e.g., requesting a "top y axis" or a "left x axis") has no more effect.

doc/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ def _check_dependencies():
207207
'scipy': ('https://docs.scipy.org/doc/scipy/', None),
208208
'tornado': ('https://www.tornadoweb.org/en/stable/', None),
209209
'xarray': ('https://docs.xarray.dev/en/stable/', None),
210+
'meson-python': ('https://meson-python.readthedocs.io/en/stable/', None)
210211
}
211212

212213

doc/devel/coding_guide.rst

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -339,55 +339,7 @@ Merging
339339

340340
Automated tests
341341
---------------
342-
343-
Whenever a pull request is created or updated, various automated test tools
344-
will run on all supported platforms and versions of Python.
345-
346-
* Make sure the Linting, GitHub Actions, AppVeyor, CircleCI, and Azure
347-
pipelines are passing before merging (All checks are listed at the bottom of
348-
the GitHub page of your pull request). Here are some tips for finding the
349-
cause of the test failure:
350-
351-
- If *Linting* fails, you have a code style issue, which will be listed
352-
as annotations on the pull request's diff.
353-
- If *Mypy* or *Stubtest* fails, you have inconsistency in type hints, which
354-
will be listed as annotations in the diff.
355-
- If a GitHub Actions or AppVeyor run fails, search the log for ``FAILURES``.
356-
The subsequent section will contain information on the failed tests.
357-
- If CircleCI fails, likely you have some reStructuredText style issue in
358-
the docs. Search the CircleCI log for ``WARNING``.
359-
- If Azure pipelines fail with an image comparison error, you can find the
360-
images as *artifacts* of the Azure job:
361-
362-
- Click *Details* on the check on the GitHub PR page.
363-
- Click *View more details on Azure Pipelines* to go to Azure.
364-
- On the overview page *artifacts* are listed in the section *Related*.
365-
366-
367-
* Codecov and CodeQL are currently for information only. Their failure is not
368-
necessarily a blocker.
369-
370-
* tox_ is not used in the automated testing. It is supported for testing
371-
locally.
372-
373-
.. _tox: https://tox.readthedocs.io/
374-
375-
* If you know only a subset of CIs need to be run, this can be controlled on
376-
individual commits by including the following substrings in commit messages:
377-
378-
- ``[ci doc]``: restrict the CI to documentation checks. For when you only
379-
changed documentation (this skip is automatic if the changes are only under
380-
``doc/`` or ``galleries/``).
381-
- ``[skip circle]``: skip the documentation build check. For when you didn't
382-
change documentation.
383-
- Unit tests can be turned off for individual platforms with
384-
385-
- ``[skip actions]``: GitHub Actions
386-
- ``[skip appveyor]`` (must be in the first line of the commit): AppVeyor
387-
- ``[skip azp]``: Azure Pipelines
388-
389-
- ``[skip ci]``: skip all CIs. Use this only if you know your changes do not
390-
need to be tested at all, which is very rare.
342+
Before being merged, a PR should pass the :ref:`automated-tests`. If you are unsure why a test is failing, ask on the PR or in our `chat space <https://gitter.im/matplotlib/matplotlib>`_
391343

392344
.. _pr-squashing:
393345

0 commit comments

Comments
 (0)