Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

merge up 3.7.0#25270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
QuLogic merged 505 commits intomatplotlib:mainfromksunden:merge_up_3.7.0
Feb 21, 2023
Merged

merge up 3.7.0#25270

QuLogic merged 505 commits intomatplotlib:mainfromksunden:merge_up_3.7.0
Feb 21, 2023

Conversation

ksunden
Copy link
Member

Merge up for 3.7.0 release

This is the "merge-up", which accomplishes a few things:

  • Removes release notes that make up the 3.7.0 release notes (and add combined version)
  • Ensures tag for 3.7.0 exists on main (as well as 3.6 series which had been previously merged into the 3.7.x branch)
  • Updates the version switcher for the website (needs a devdocs release)

This should have minimal diffs outside of release machinery (Most will have keptmain where conflicts arose, aside froms/generate/generated/ in animation examples)

The following changes are included (mostly backports of existing PRs):

PR Summary

PR Checklist

Documentation and Tests

  • Has pytest style unit tests (andpytest passes)
  • Documentation is sphinx and numpydoc compliant (the docs shouldbuild without error).
  • New plotting related features are documented with examples.

Release Notes

  • New features are marked with a.. versionadded:: directive in the docstring and documented indoc/users/next_whats_new/
  • API changes are marked with a.. versionchanged:: directive in the docstring and documented indoc/api/next_api_changes/
  • Release notes conform with instructions innext_whats_new/README.rst ornext_api_changes/README.rst

QuLogicand others added30 commitsNovember 21, 2022 22:14
…t-of-pr-24520-on-v3.6.xBackport PRmatplotlib#24520 on branch v3.6.x (Doc: Fix grammar and spelling)
…t-of-pr-24517-on-v3.6.xBackport PRmatplotlib#24517 on branch v3.6.x (DOC: improve grammar and consistency)
…t-of-pr-24521-on-v3.6.xBackport PRmatplotlib#24521 on branch v3.6.x (Doc: improve spelling and grammar)
…t-of-pr-24514-on-v3.6.xBackport PRmatplotlib#24514 on branch v3.6.x (Fix potential issue in contour)
…t-of-pr-24548-on-v3.6.xBackport PRmatplotlib#24548 on branch v3.6.x (DOC: improved the doc for layout_engine.py)
…t-of-pr-24299-on-v3.6.xBackport PRmatplotlib#24299 on branch v3.6.x (Rework style sheet reference example to cycle props)
…t-of-pr-24299-on-v3.6.2-docBackport PRmatplotlib#24299 on branch v3.6.2-doc (Rework style sheet reference example to cycle props)
…t-of-pr-24540-on-v3.6.xBackport PRmatplotlib#24540 on branch v3.6.x (DOC: add note about enabling c++11 support for old gcc)
…t-of-pr-24540-on-v3.6.2-docBackport PRmatplotlib#24540 on branch v3.6.2-doc (DOC: add note about enabling c++11 support for old gcc)
Merge pull requestmatplotlib#24579 from QuLogic/action-permissionsAdd explicit permissions to GitHub Actions(cherry picked from commit24f9128)
…r-24579-on-v3.6.xBackport PRmatplotlib#24579: Add explicit permissions to GitHub Actions
…t-of-pr-24580-on-v3.6.2-docBackport PRmatplotlib#24580 on branch v3.6.2-doc (Update the polar transform information in docmatplotlib#24499)
…t-of-pr-24580-on-v3.6.xBackport PRmatplotlib#24580 on branch v3.6.x (Update the polar transform information in docmatplotlib#24499)
…t-of-pr-23868-on-v3.6.2-docBackport PRmatplotlib#23868 on branch v3.6.2-doc (Show errors and warnings in doc CI after build.)
…t-of-pr-24598-on-v3.6.2-docBackport PRmatplotlib#24598 on branch v3.6.2-doc (Check for errors/warnings on failed doc-builds)
…t-of-pr-23868-on-v3.6.xBackport PRmatplotlib#23868 on branch v3.6.x (Show errors and warnings in doc CI after build.)
dstansbyand others added18 commitsFebruary 9, 2023 20:35
…t-of-pr-25052-on-v3.7.xBackport PRmatplotlib#25052 on branch v3.7.x (Support both Bbox and list for bbox to table/Table)
…t-of-pr-25174-on-v3.7.xBackport PRmatplotlib#25174 on branch v3.7.x (Accept LA icons for the toolbar)
…t-of-pr-25183-on-v3.7.xBackport PRmatplotlib#25183 on branch v3.7.x (FIX: do not use deprecated API internally)
…t-of-pr-25085-on-v3.7.xBackport PRmatplotlib#25085 on branch v3.7.x (FIX: only try to update blit caches if the canvas we expect)
…t-of-pr-25193-on-v3.7.xBackport PRmatplotlib#25193 on branch v3.7.x (Fix displacement of colorbar for eps with bbox_inches='tight')
…on sequence type in `Line2D` (matplotlib#25201)Co-authored-by: Oscar Gustafsson <oscar.gustafsson@gmail.com>
DOC: updated the supported versions of MatplotlibDOC: re-run the github statusDOC: start to merge the whats_newDOC: re-arrange whats newDOC: add top-level rst TOC for 3.7 docsDOC: fix markup in github stats3.7.0 behavior and deprecation release notes3.7.0 removalsDOC: merge up development API changesDOC: spell behaviour britishlyRemove files, add last release noteDOC: update switcher.jsonFix broken linksDOC: fix internal linksDOC: more linksfix version number in dependency version listLast couple release notesUpdate github stats
DOC: restore SHA to footer(cherry picked from commit73909bc)
Highlights of this release include:- Plotting and Annotation improvements  - ``hatch`` parameter for pie  - Polar plot errors drawn in polar coordinates  - Additional format string options in `~matplotlib.axes.Axes.bar_label`  - ``ellipse`` boxstyle option for annotations  - The *extent* of ``imshow`` can now be expressed with units  - Reversed order of legend entries  - ``pcolormesh`` accepts RGB(A) colors  - View current appearance settings for ticks, tick labels, and gridlines  - Style files can be imported from third-party packages- Improvements to 3D Plotting  - 3D plot pan and zoom buttons  - *adjustable* keyword argument for setting equal aspect ratios in 3D  - ``Poly3DCollection`` supports shading  - rcParam for 3D pane color- Figure and Axes Layout  - ``colorbar`` now has a *location* keyword argument  - Figure legends can be placed outside figures using constrained_layout  - Per-subplot keyword arguments  in ``subplot_mosaic``  - ``subplot_mosaic`` no longer provisional- Widget Improvements  - Custom styling of button widgets  - Blitting in Button widgets- Other Improvements  - Source links can be shown or hidden for each Sphinx plot directive  - Figure hooks- New & Improved Narrative Documentation  - Brand new :doc:`Animations </tutorials/introductory/animation_tutorial>` tutorial.  - New grouped and stacked `bar chart <../../gallery/index.html#lines_bars_and_markers>`_ examples.  - New section for new contributors and reorganized git instructions in the :ref:`contributing guide<contributing>`.  - Restructured :doc:`/tutorials/text/annotations` tutorial.
REL: v3.7.0Highlights of this release include:- Plotting and Annotation improvements  - ``hatch`` parameter for pie  - Polar plot errors drawn in polar coordinates  - Additional format string options in `~matplotlib.axes.Axes.bar_label`  - ``ellipse`` boxstyle option for annotations  - The *extent* of ``imshow`` can now be expressed with units  - Reversed order of legend entries  - ``pcolormesh`` accepts RGB(A) colors  - View current appearance settings for ticks, tick labels, and gridlines  - Style files can be imported from third-party packages- Improvements to 3D Plotting  - 3D plot pan and zoom buttons  - *adjustable* keyword argument for setting equal aspect ratios in 3D  - ``Poly3DCollection`` supports shading  - rcParam for 3D pane color- Figure and Axes Layout  - ``colorbar`` now has a *location* keyword argument  - Figure legends can be placed outside figures using constrained_layout  - Per-subplot keyword arguments  in ``subplot_mosaic``  - ``subplot_mosaic`` no longer provisional- Widget Improvements  - Custom styling of button widgets  - Blitting in Button widgets- Other Improvements  - Source links can be shown or hidden for each Sphinx plot directive  - Figure hooks- New & Improved Narrative Documentation  - Brand new :doc:`Animations </tutorials/introductory/animation_tutorial>` tutorial.  - New grouped and stacked `bar chart <../../gallery/index.html#lines_bars_and_markers>`_ examples.  - New section for new contributors and reorganized git instructions in the :ref:`contributing guide<contributing>`.  - Restructured :doc:`/tutorials/text/annotations` tutorial.
Copy link
Member

@oscargusoscargus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Looks good, but not sure if these should be squashed or not? I mean, most of the backports are already in etc, so really no point in adding those one more time. (Nor adding 500+ commits to the history.)

@ksundenksunden added this to thev3.8.0 milestoneFeb 21, 2023
@ksunden
Copy link
MemberAuthor

Judging from#25072 and#23918, I do not think it is standard to squash merge (and if we did squash merge, that should probably be added to the ignore, otherwise blames would be harder to navigate, I think)

@QuLogic
Copy link
Member

QuLogic commentedFeb 21, 2023•
edited
Loading

Squash merge does not make any sense; the point is to merge the branches not the code changes.

@QuLogicQuLogic merged commit70e0ba8 intomatplotlib:mainFeb 21, 2023
ksunden added a commit to ksunden/matplotlib that referenced this pull requestFeb 22, 2023
These were all properly included in the 3.7 release notes, but for some reason not removed bymatplotlib#25270, despite being removed inmatplotlib#25194 along all of the other similar notes
QuLogic added a commit to QuLogic/matplotlib that referenced this pull requestJul 28, 2023
These appear to have been accidentally resurrected while merging up tomain inmatplotlib#25270.
@QuLogicQuLogic mentioned this pull requestJul 28, 2023
2 tasks
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@dstansbydstansbydstansby approved these changes

@oscargusoscargusoscargus approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.8.0
Development

Successfully merging this pull request may close these issues.

[Bug]: 3D surface is not plotted for the contour3d_3 example in the gallery
11 participants
@ksunden@QuLogic@dstansby@oscargus@story645@timhoffm@tacaswell@rcomer@jklymak@anntzer@meeseeksmachine
[8]ページ先頭
©2009-2025 Movatter.jp