8000 Update pinned oldest win image on azure by timhoffm · Pull Request #29992 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]

Skip to content

Update pinned oldest win image on azure #29992

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 5, 2025

Conversation

timhoffm
Copy link
Member
@timhoffm timhoffm commented May 1, 2025

The windows-2019 image will be deprecated on 1.6.2025 (#29797 (comment)). Also, this is a test whether the timeouts #29797 are related to the windows-2019 image.

The windows-2019 image will be deprecated on 1.6.2025.
Also, this is a test whether the timeouts matplotlib#29797 are related to the
windows-2019 image.
8000
@timhoffm timhoffm force-pushed the update-winimage branch from ce60580 to aea28b6 Compare May 1, 2025 07:21
@timhoffm
Copy link
Member Author
timhoffm commented May 1, 2025

First run did not exhibit timeout. Force push to rerun CI. Let's check whether this is reliable by running CI multiple times.

@timhoffm
Copy link
Member Author
timhoffm commented May 1, 2025

Second run did not exhibit timeout. Force push to rerun CI.

@timhoffm
Copy link
Member Author
timhoffm commented May 1, 2025

This did not have timeouts three times in a row.

I suggest to merge this and see whether our timouts are gone. We would have to update the image in a month anyway due to the deprecation, and I don't think it's a relevant miss if we don't run the windows-2019 image.

@timhoffm timhoffm marked this pull request as draft May 1, 2025 08:39
@timhoffm timhoffm marked this pull request as ready for review May 1, 2025 08:40
@rcomer
Copy link
Member
rcomer commented May 1, 2025

There is an if-loop at line 123 that the comment states is for windows-2019. I guess that can be removed.

The windows-2019 image will be deprecated on 1.6.2025.
Also, this is a test whether the timeouts matplotlib#29797 are related to the
windows-2019 image.
@timhoffm timhoffm force-pushed the update-winimage branch from 4958941 to 3458e53 Compare May 2, 2025 06:32
@dstansby dstansby added this to the v3.10-doc milestone May 5, 2025
@dstansby
Copy link
Member
dstansby commented May 5, 2025

I'm guessing but not 100% this wants to be backported, so I've milestoned for that on the basis that it's easier to have the backports opened and close them if not wanted than having to manually backport.

@dstansby dstansby merged commit ab102c0 into matplotlib:main May 5, 2025
40 checks passed
Copy link
lumberbot-app bot commented May 5, 2025

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 v3.10.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 ab102c079ae0474861bbb1dcc64da436d1a84f8b
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #29992: Update pinned oldest win image on azure'
  1. Push to a named branch:
git push YOURFORK v3.10.x:auto-backport-of-pr-29992-on-v3.10.x
  1. Create a PR against branch v3.10.x, I would have named this PR:

"Backport PR #29992 on branch v3.10.x (Update pinned oldest win image on azure)"

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.

Copy link
lumberbot-app bot commented May 5, 2025

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 v3.10.1-doc
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 ab102c079ae0474861bbb1dcc64da436d1a84f8b
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #29992: Update pinned oldest win image on azure'
  1. Push to a named branch:
git push YOURFORK v3.10.1-doc:auto-backport-of-pr-29992-on-v3.10.1-doc
  1. Create a PR against branch v3.10.1-doc, I would have named this PR:

"Backport PR #29992 on branch v3.10.1-doc (Update pinned oldest win image on azure)"

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.

rcomer pushed a commit to rcomer/matplotlib that referenced this pull request May 5, 2025
@timhoffm timhoffm deleted the update-winimage branch May 5, 2025 09:58
dstansby added a commit that referenced this pull request May 5, 2025
….10.x

Backport PR #29992 on v3.10.x: Update pinned oldest win image on azure
rcomer pushed a commit to rcomer/matplotlib that referenced this pull request May 5, 2025
…9992-on-v3.10.x

Backport PR matplotlib#29992 on v3.10.x: Update pinned oldest win image on azure

(cherry picked from commit acb7361)
rcomer pushed a commit to rcomer/matplotlib that referenced this pull request May 5, 2025
… image on azure

I diverged from instructions and cherry-picked the commit from the
v3.10.x branch, since that produced no conflicts.

(cherry picked from commit acb7361)
@rcomer rcomer modified the milestones: v3.10-doc, v3.10.2 May 5, 2025
@ksunden ksunden mentioned this pull request May 9, 2025
5 tasks
@timhoffm
Copy link
Member Author
timhoffm commented May 9, 2025

Note: This seems not to fix it completely. This is a run with windows-2022 and it still produces a timeout. 😢

https://dev.azure.com/matplotlib/matplotlib/_build/results?buildId=43805&view=logs&j=f92c32cd-721a-536e-3a87-a0c010db3f7f&t=18f30b55-1017-4d18-b8e0-646f3513b769

I'm not yet taking any further action, like repoening #29981, yet. Let's monitor the situation further.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
0