Skip to content

Fix devdeps figure-test CI yet again - #8578

Merged
Cadair merged 2 commits into
sunpy:mainfrom
ayshih:remove_freetype
Apr 16, 2026
Merged

Fix devdeps figure-test CI yet again#8578
Cadair merged 2 commits into
sunpy:mainfrom
ayshih:remove_freetype

Conversation

@ayshih

@ayshih ayshih commented Apr 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

PR Description

This PR fixes the devdeps figure-test CI as result of matplotlib/matplotlib#30161:

  • Remove freetype version from hash library filename because the freetype version has changed, but it's unnecessary to track separately from matplotlib version
  • Update figure hashes due to changes to text rendering

AI Assistance Disclosure

AI tools were used for:

  • Code generation (e.g., when writing an implementation or fixing a bug)
  • Test/benchmark generation
  • Documentation (including examples)
  • Research and understanding
  • No AI tools were used

Regardless of AI use, the human contributor remains fully responsible for correctness, design choices, licensing compatibility, and long-term maintainability.

@ayshih ayshih added the Infrastructure Issues or PRs that affect the CI or packaging. label Apr 15, 2026
@ayshih ayshih changed the title Remove freetype version from hash library filename Fix devdeps figure-test CI yet again Apr 15, 2026
@ayshih ayshih added the Tests Affects tests in some measure. label Apr 15, 2026
@ayshih
ayshih marked this pull request as ready for review April 15, 2026 18:37
@Cadair
Cadair merged commit 18c0a69 into sunpy:main Apr 16, 2026
53 of 56 checks passed
@lumberbot-app

lumberbot-app Bot commented Apr 16, 2026

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 7.0
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 18c0a698afb6848a54c8fcd5c55bfbd0e8092e8f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #8578: Fix devdeps figure-test CI yet again'
  1. Push to a named branch:
git push YOURFORK 7.0:auto-backport-of-pr-8578-on-7.0
  1. Create a PR against branch 7.0, I would have named this PR:

"Backport PR #8578 on branch 7.0 (Fix devdeps figure-test CI yet again)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@lumberbot-app lumberbot-app Bot added the Still Needs Manual Backport This PR needs manually backporting. label Apr 16, 2026
@lumberbot-app

lumberbot-app Bot commented Apr 16, 2026

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 7.1
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 18c0a698afb6848a54c8fcd5c55bfbd0e8092e8f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #8578: Fix devdeps figure-test CI yet again'
  1. Push to a named branch:
git push YOURFORK 7.1:auto-backport-of-pr-8578-on-7.1
  1. Create a PR against branch 7.1, I would have named this PR:

"Backport PR #8578 on branch 7.1 (Fix devdeps figure-test CI yet again)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

ayshih pushed a commit to ayshih/sunpy that referenced this pull request Apr 17, 2026
@Cadair @ayshih
Merge pull request sunpy#8578 from ayshih/remove_freetype
549fea5 
(cherry picked from commit 18c0a69)
@ayshih ayshih mentioned this pull request Apr 17, 2026
Merged
ayshih pushed a commit to ayshih/sunpy that referenced this pull request Apr 17, 2026
@Cadair @ayshih
Merge pull request sunpy#8578 from ayshih/remove_freetype
4968b5e 
(cherry picked from commit 18c0a69)
ayshih pushed a commit to ayshih/sunpy that referenced this pull request Apr 17, 2026
@Cadair @ayshih
Merge pull request sunpy#8578 from ayshih/remove_freetype
a500227 
(cherry picked from commit 18c0a69)
@ayshih ayshih mentioned this pull request Apr 17, 2026
Merged
@Cadair Cadair removed the Still Needs Manual Backport This PR needs manually backporting. label Apr 19, 2026
@ayshih
ayshih deleted the remove_freetype branch May 8, 2026 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Cadair Cadair Cadair approved these changes

Assignees

No one assigned

Labels

Infrastructure Issues or PRs that affect the CI or packaging. Tests Affects tests in some measure.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ayshih @Cadair