GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — ci: Fix image preload with multiple conflicts by QuLogic · Pull Request #30274 · matplotlib/matplotlib

Conversation

@QuLogic

@QuLogic QuLogic commented Jul 8, 2025

Copy link
Copy Markdown
Member

PR summary

I only tested #30231 with a single conflict. Unfortunately, the variable quoting did not work when there were multiple conflicts. This PR should fix that (and currently has a test change to verify it.)

PR checklist

  • [n/a] "closes #0000" is in the body of the PR description to link the related issue
  • new and changed code is tested
  • [n/a] Plotting related features are demonstrated in an example
  • [n/a] New Features and API Changes are noted with a directive and release note
  • [n/a] Documentation complies with general and docstring guidelines

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@QuLogic QuLogic added this to the v3.11.0 milestone Jul 8, 2025
@QuLogic QuLogic added this to Font and text overhaul Jul 8, 2025
@QuLogic QuLogic added the CI: testing CI configuration and testing label Jul 8, 2025
@github-project-automation github-project-automation Bot moved this to Waiting for other PR in Font and text overhaul Jul 8, 2025
@QuLogic QuLogic changed the title Fix preload ci: Fix image preload with multiple conflicts Jul 8, 2025
@QuLogic QuLogic moved this from Waiting for other PR to Ready for Review in Font and text overhaul Jul 8, 2025
@QuLogic
QuLogic force-pushed the fix-preload branch from cbcc4e1 to 854caff Compare July 8, 2025 08:57
@QuLogic

QuLogic commented Jul 8, 2025

Copy link
Copy Markdown
Member Author

Since this passed on 854caff, I've dropped that commit.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@QuLogic
ci: Fix image preload with multiple conflicts
aff20cf
@QuLogic
QuLogic force-pushed the fix-preload branch from 854caff to aff20cf Compare July 9, 2025 03:21
jkseppan
jkseppan approved these changes Jul 9, 2025
View reviewed changes
@QuLogic
QuLogic merged commit 572540d into matplotlib:text-overhaul Jul 9, 2025
@github-project-automation github-project-automation Bot moved this from Ready for Review to Done in Font and text overhaul Jul 9, 2025
@QuLogic
QuLogic deleted the fix-preload branch July 9, 2025 05:45
@QuLogic

QuLogic commented Jul 9, 2025

Copy link
Copy Markdown
Member Author

Arg, I seem to have accidentally committed the mlab bits here instead of #30273. But anyway, it should get joined up when main is merged into this branch again.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@QuLogic QuLogic mentioned this pull request Aug 23, 2025
Implement text shaping with libraqm #30000
Merged
3 of 5 tasks
wavebyrd pushed a commit to wavebyrd/matplotlib that referenced this pull request Mar 13, 2026
@QuLogic
Merge pull request matplotlib#30274 from QuLogic/fix-preload
08885cc 
ci: Fix image preload with multiple conflicts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jkseppan jkseppan jkseppan approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

CI: testing CI configuration and testing

Projects

Font and text overhaul
Status: Done

Milestone

v3.11.0

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

2 participants

@QuLogic @jkseppan
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.