Skip to content

Change the way we update astropy-iers-data for active branches - #19472

Merged
neutrinoceros merged 5 commits into
astropy:mainfrom
pllim:iers-data-sep-prs
Mar 24, 2026
Merged

neutrinoceros merged 5 commits into
astropy:mainfrom
pllim:iers-data-sep-prs

Conversation

@pllim

@pllim pllim commented Mar 19, 2026 •

Copy link
Copy Markdown
Member

Description

This pull request is to address the problem that auto backport of auto update of astropy-iers-data is now impossible after #19380 (case study: #19461). Coincidentally, Stuart figured out how to deploy cron job to non-default branches (https://github.com/sunpy/sunpy/blob/main/.github/workflows/scheduled_builds.yml). So, we will leverage Stuart's aura to run the auto update script in backport branch instead of trying to backport the update.

  • By checking this box, the PR author has requested that maintainers do NOT use the "Squash and Merge" button. Maintainers should respect this when possible; however, the final decision is at the discretion of the maintainer that merges the PR.

@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution to Astropy! 🌌 This checklist is meant to remind the package maintainers who will review this pull request of some common things to look for.

  • Do the proposed changes actually accomplish desired goals?
  • Do the proposed changes follow the Astropy coding guidelines?
  • Are tests added/updated as required? If so, do they follow the Astropy testing guidelines?
  • Are docs added/updated as required? If so, do they follow the Astropy documentation guidelines?
  • Is rebase and/or squash necessary? If so, please provide the author with appropriate instructions. Also see instructions for rebase and squash.
  • Did the CI pass? If no, are the failures related? If you need to run daily and weekly cron jobs as part of the PR, please apply the "Extra CI" label. Codestyle issues can be fixed by the bot.
  • Is a change log needed? If yes, did the change log check pass? If no, add the "no-changelog-entry-needed" label. If this is a manual backport, use the "skip-changelog-checks" label unless special changelog handling is necessary.
  • Is this a big PR that makes a "What's new?" entry worthwhile and if so, is (1) a "what's new" entry included in this PR and (2) the "whatsnew-needed" label applied?
  • At the time of adding the milestone, if the milestone set requires a backport to release branch(es), apply the appropriate "backport-X.Y.x" label(s) before merge.

@astrofrog

Copy link
Copy Markdown
Member

Taking a step back, why is backporting automatically impossible now?

@pllim

pllim commented Mar 20, 2026

Copy link
Copy Markdown
Member Author

@astrofrog as you can see in #19461 , scripts/lowest-resolved-tree.txt would always conflict if branches start to diverge over time.

@astrofrog

Copy link
Copy Markdown
Member

Ok that makes sense, though obviously that's a pain. @neutrinoceros - can we filter out astropy-iers-data from scripts/lowest-resolved-tree.txt somehow?

@neutrinoceros

Copy link
Copy Markdown
Contributor

If you're asking if there's an option in uv tree to exclude a specific package, I think the answer is no. Of course we could also implement the filtering in a custom script...
I mentioned this privately with @pllim but I think the simplest solution is just to backport lowest-resolved-tree.txt as is (even if it's not used anywhere in the backport branch), so following auto backports just work.

@pllim

pllim commented Mar 23, 2026 •

Copy link
Copy Markdown
Member Author

just to backport lowest-resolved-tree.txt

I think blindly backporting that TXT is very confusing. In the future, the backport branch would have its own version that should reflect its own dependencies, not the main.

@pllim
pllim force-pushed the iers-data-sep-prs branch from bc92468 to beda7c8 Compare March 23, 2026 20:32
@pllim

This comment was marked as outdated.

@neutrinoceros

Copy link
Copy Markdown
Contributor

pre-commit is now passing. Is this ready for review ?

@Cadair

Cadair commented Mar 24, 2026

Copy link
Copy Markdown
Member

I'm approving based on the workflows, not actually if this is a good idea or any opinions on the whole backport situation.

@pllim
pllim marked this pull request as ready for review March 24, 2026 16:37
@pllim
pllim force-pushed the iers-data-sep-prs branch from 0845c94 to 2c729fc Compare March 24, 2026 16:37
@pllim

pllim commented Mar 24, 2026

Copy link
Copy Markdown
Member Author

Is this ready for review ?

Yes. I think @astrofrog still has concerns?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

#19473 should be equivalent change but in the backport branch. Please review that too. Thanks!

@astrofrog astrofrog left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm not thrilled with the extra step in the release notes, but I guess this could maybe be automated at some point in future

@neutrinoceros
neutrinoceros merged commit 6b305c4 into astropy:main Mar 24, 2026
36 checks passed
@pllim
pllim deleted the iers-data-sep-prs branch March 24, 2026 17:31
@pllim

pllim commented Mar 24, 2026

Copy link
Copy Markdown
Member Author

Oh... It's merged already. I was typing a reply and got pulled into something else. 😆

I was gonna say, we could have also not do anything and just manually backport until backport branch has this lowest-resolved-tree.txt file of its own, and then see how painful that is to auto backport.

Given is is merged now, we can always revisit in the future to see if we can revert. 🤷‍♀️

@pllim

pllim commented Mar 24, 2026

Copy link
Copy Markdown
Member Author

I opened a reminder issue here:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants