Skip to content

Exclude structured_units.rst for erfa-dev#18551

Merged
pllim merged 2 commits intoastropy:mainfrom
mhvk:adjust-to-erfa-dev
Aug 26, 2025
Merged

Exclude structured_units.rst for erfa-dev#18551
pllim merged 2 commits intoastropy:mainfrom
mhvk:adjust-to-erfa-dev

Conversation

@mhvk
Copy link
Copy Markdown
Contributor

@mhvk mhvk commented Aug 25, 2025

Description

This pull request is to address the failure from a recent update in erfa. Similar to #18549, but just avoids running the doctest with erfa-dev (which should be fine). Main advantage is that there is a note to undo...

  • 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.

@mhvk mhvk added this to the v7.2.0 milestone Aug 25, 2025
@mhvk mhvk added testing Affects-dev PRs and issues that do not impact an existing Astropy release erfa no-changelog-entry-needed labels Aug 25, 2025
@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.

@mhvk
Copy link
Copy Markdown
Contributor Author

mhvk commented Aug 25, 2025

Hmm, this passed the relevant test, but not "load tox environments", for reasons that seem unrelated.

Comment thread pyproject.toml Outdated
@mhvk
Copy link
Copy Markdown
Contributor Author

mhvk commented Aug 26, 2025

@pllim - thanks, how can I not have seen that? Hopefully things still work, if not I'll check locally.

@pllim
Copy link
Copy Markdown
Member

pllim commented Aug 26, 2025

You might need to tag a new dev tag over at pyerfa or something because devdeps is picking up the following version and still failing:

pyerfa==2.0.1.7.dev18+gbd0276210

Also we pick up pyerfa-dev from https://pypi.anaconda.org/liberfa/simple so please make sure the dev wheel with new tag is pushed there before rerunning devdeps here. Thanks!

@mhvk mhvk force-pushed the adjust-to-erfa-dev branch from f427ad0 to 207297c Compare August 26, 2025 14:47
@mhvk
Copy link
Copy Markdown
Contributor Author

mhvk commented Aug 26, 2025

Gee, where was my brain yesterday? Not only got the name wrong, as you noticed, but also the actual version number - 2.1.0.7 is the actual next release that is in development. Also, for some reason, v2.1.0.6 never got properly released (was relevant for infrastructure mostly, so no big deal, but I should have noticed it...). Anyway, hopefully things will now just work.

Comment thread pyproject.toml Outdated
dependencies = [
"numpy>=1.24",
"pyerfa>=2.0.1.1",
"pyerfa>=2.0.1.1", # For >=2.0.1.8, adjust structured_units.rst and doctest-requires
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.

Suggested change
"pyerfa>=2.0.1.1", # For >=2.0.1.8, adjust structured_units.rst and doctest-requires
"pyerfa>=2.0.1.1", # For >=2.0.1.7, adjust structured_units.rst and doctest-requires

@mhvk
Copy link
Copy Markdown
Contributor Author

mhvk commented Aug 26, 2025

Yikes, still not working. Will investigate locally.

@mhvk mhvk force-pushed the adjust-to-erfa-dev branch from 207297c to 0e051d9 Compare August 26, 2025 15:14
@mhvk
Copy link
Copy Markdown
Contributor Author

mhvk commented Aug 26, 2025

Dyslexia too, apparently... 2.1.0.7 or 2.0.1.7. Sigh.

@pllim
Copy link
Copy Markdown
Member

pllim commented Aug 26, 2025

2.1.0.7 or 2.0.1.7

Wow I missed that too!

@mhvk
Copy link
Copy Markdown
Contributor Author

mhvk commented Aug 26, 2025

Looks like it passed now...

Comment thread pyproject.toml Outdated
Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>
@mhvk
Copy link
Copy Markdown
Contributor Author

mhvk commented Aug 26, 2025

OK, done. Thanks, @pllim, and apologies for all the silly mistakes in a 2-line changed PR...

Copy link
Copy Markdown
Member

@pllim pllim left a comment

Choose a reason for hiding this comment

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

No worries. Thanks for the fix!

@pllim pllim merged commit 674c737 into astropy:main Aug 26, 2025
1 of 2 checks passed
@pllim pllim modified the milestones: v7.2.0, v7.1.1 Aug 26, 2025
@pllim
Copy link
Copy Markdown
Member

pllim commented Aug 26, 2025

Actually maybe we should backport to future-proof the release branch CI

@meeseeksdev backport to v7.1.x

@lumberbot-app

This comment was marked as resolved.

@pllim
Copy link
Copy Markdown
Member

pllim commented Aug 26, 2025

Hmm. Let me rerun devdeps on v7.1.x to make sure. (Yes, fails now, so we need the backport.)

pllim added a commit to pllim/astropy that referenced this pull request Aug 26, 2025
* Exclude structured_units.rst for erfa-dev

* Update pyproject.toml [skip ci]

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>

---------

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>
(cherry picked from commit 674c737)
@pllim
Copy link
Copy Markdown
Member

pllim commented Aug 26, 2025

Manual backport at #18554

pllim added a commit to pllim/astropy that referenced this pull request Aug 26, 2025
* Exclude structured_units.rst for erfa-dev

* Update pyproject.toml

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>

---------

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>
(cherry picked from commit 674c737)
@mhvk mhvk deleted the adjust-to-erfa-dev branch August 26, 2025 18:22
pllim added a commit that referenced this pull request Aug 26, 2025
Backport PR #18551 on branch v7.1.x (Exclude structured_units.rst for erfa-dev)
@neutrinoceros
Copy link
Copy Markdown
Contributor

I'm running into the comment from this PR in #19380, and I don't think I understand the note at all... pyerfa 2.0.1.7 doesn't exist yet ? even 2.0.1.6 is in the future, so why was an hypothetical future version even mentioned ?

@pllim
Copy link
Copy Markdown
Member

pllim commented Mar 9, 2026

I think this was to future proof.

@mhvk
Copy link
Copy Markdown
Contributor Author

mhvk commented Mar 10, 2026

It was to future proof indeed, with 2.0.1.7 meant to be the next release up. Looking at pyerfa, I see it has a 2.0.1.6 tag, but no corresponding release, so something went wrong there... Ouch... (Unfortunately, unable to deal with it now...).

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

Labels

Affects-dev PRs and issues that do not impact an existing Astropy release erfa installation no-changelog-entry-needed testing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants