Skip to content

Conversation

ksunden
Copy link
Member

@ksunden ksunden commented Apr 4, 2024

Conflicts (so pay the most attention to these):

CONFLICT (content): Merge conflict in .github/workflows/cibuildwheel.yml
CONFLICT (content): Merge conflict in pyproject.toml
CONFLICT (modify/delete): setup.py deleted in HEAD and modified in v3.8.x. Version v3.8.x of setup.py left in tree.

In particular, since the numpy pin is included in the build requires in pyproject.toml, I have removed the --pre handling from cibw that was making np2 compatible builds on main.

PR summary

PR checklist

tacaswell and others added 26 commits March 14, 2024 15:28
…t-of-pr-27921-on-v3.8.x

Backport PR matplotlib#27921 on branch v3.8.x (Avoid modifying user input to Axes.bar)
…t-of-pr-27875-on-v3.8.x

Backport PR matplotlib#27875 on branch v3.8.x (macosx: Clean up single-shot timers correctly)
…t-of-pr-27933-on-v3.8.x

Backport PR matplotlib#27933 on branch v3.8.x (Update "Created with" url in hand.svg)
…t-of-pr-27975-on-v3.8.x

Backport PR matplotlib#27975 on branch v3.8.x (DOC: Fix typo in ```ax.transData.inversed()```)
…t-of-pr-27975-on-v3.8.3-doc

Backport PR matplotlib#27975 on branch v3.8.3-doc (DOC: Fix typo in ```ax.transData.inversed()```)
…t-of-pr-27988-on-v3.8.x

Backport PR matplotlib#27988 on branch v3.8.x (gtk: Ensure pending draws are done before GTK draw)
…t-of-pr-28000-on-v3.8.x

Backport PR matplotlib#28000 on branch v3.8.x (Fix color sequence data for Set2 and Set3)
Unpin numpy 2, build against prerelease numpy in CIBW
…t-of-pr-27955-on-v3.8.x

Backport PR matplotlib#27955 on branch v3.8.x (Add a draw during show for macos backend)
This is the fourth micro release of the 3.8 series.

Highlights of the 3.8.4 release include:

- Enable building against numpy 2.0; released wheels are built against numpy 2
- macosx: Clean up single-shot timers correctly
- Add a draw during show for macos backend
- Fix color sequence data for Set2 and Set3
- gtk: Ensure pending draws are done before GTK draw
- Update "Created with" url in hand.svg
- Avoid modifying user input to Axes.bar
- fix quiver3d incorrect arrow colors
@github-actions github-actions bot added CI: Run cibuildwheel Run wheel building tests on a PR Documentation: user guide files in galleries/users_explain or doc/users labels Apr 4, 2024
@QuLogic QuLogic added this to the v3.9.0 milestone Apr 4, 2024
@tacaswell tacaswell merged commit d7f37d2 into matplotlib:main Apr 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: Run cibuildwheel Run wheel building tests on a PR Documentation: user guide files in galleries/users_explain or doc/users
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants