Skip to content

Commit 352f688

Browse files
Merge branch 'master' of https://github.com/matplotlib/matplotlib into change_return_type_to_normal_list
2 parents 07b4398 + 3f78c1a commit 352f688

22 files changed

+317
-624
lines changed

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.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ added to Matplotlib, see :ref:`whats-new`.
2121
.. note::
2222

2323
The list below is a table of contents of individual files from the
24-
'next_api_changes' folder.
24+
most recent :file:`api_changes_X.Y` folder.
2525

2626
When a release is made
2727

28-
- The files in 'next_api_changes/' should be moved to a new file in
29-
'prev_api_changes/'.
3028
- The include directive below should be changed to point to the new file
3129
created in the previous step.
3230

@@ -35,6 +33,6 @@ added to Matplotlib, see :ref:`whats-new`.
3533
:glob:
3634
:maxdepth: 1
3735

38-
next_api_changes/*
36+
api_changes_3.3/*
3937

4038
.. include:: prev_api_changes/api_changes_3.2.0.rst
File renamed without changes.

doc/api/next_api_changes/README.rst renamed to doc/api/api_changes_3.3/README.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Adding API change notes
44
=======================
55

6-
API change notes for future releases are collected in the directory
7-
:file:`next_api_changes`. They are divided into four categories:
6+
API change notes for future releases are collected in the most recent directory
7+
:file:`api_changes_X.Y`. They are divided into four categories:
88

99
- **Deprecations**: Announcements of future changes. Typically, these will
1010
raise a deprecation warning and users of this API should change their code
@@ -27,4 +27,3 @@ A typical entry could look like this::
2727
~~~~~~~~
2828
The unused `Locator.autoscale()` method is deprecated (pass the axis
2929
limits to `Locator.view_limits()` instead).
30-
File renamed without changes.

doc/api/next_api_changes/deprecations.rst renamed to 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.
File renamed without changes.
File renamed without changes.

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/coding_guide.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ Documentation
9595
:file:`doc/users/whats_new.rst`.
9696

9797
* If you change the API in a backward-incompatible way, please
98-
document it in the relevant file in :file:`doc/api/next_api_changes`.
98+
document it in the relevant file in most recent
99+
:file:`doc/api/api_changes_X.Y`.
99100

100101
.. _pr-labels:
101102

@@ -145,8 +146,8 @@ Merging
145146
the PR.
146147

147148
Ensure that all API changes are documented in the relevant file in
148-
:file:`doc/api/next_api_changes` and significant new features have and
149-
entry in :file:`doc/user/whats_new`.
149+
the most recent :file:`doc/api/api_changes_X.Y` and significant new features
150+
have an entry in :file:`doc/user/whats_new`.
150151

151152
- If a PR already has a positive review, a core developer (e.g. the first
152153
reviewer, but not necessarily) may champion that PR for merging. In order

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy