Skip to content

Merge master into dev (pre-release safety) - #827

Merged
d-chambers merged 3 commits into
devfrom
sync-825-to-dev
Aug 5, 2026
Merged

Merge master into dev (pre-release safety)#827
d-chambers merged 3 commits into
devfrom
sync-825-to-dev

Conversation

@d-chambers

@d-chambers d-chambers commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Description

Merges master into dev to bring #825, which makes the stable docs workflow pre-release safe. This is the last prerequisite before tagging a beta from dev.

Net change is small — 2 files, no Python — because dev already had everything else from master.

Conflict 1: build_deploy_stable_docs.yaml

Dev carried the first version of the pre-release guard (#811); master now has #825's, which supersedes it in two ways:

  • pre-release runs are keyed on their tag, so publishing one pre-release cannot cancel another's build before it attaches docs.zip
  • the workflow_dispatch path matches only final vX.Y.Z tags, so a pre-release tag is never selected as the stable docs version

Took master's version, and kept dev's persist-credentials: false, which master does not have. Verified the result differs from master's copy by exactly that one line.

Conflict 2: docs/tutorial/coords.qmd

This is a squash-merge artifact rather than a real disagreement. #814 reached dev as #820, which was squash merged, so master's commit is not an ancestor of dev and git re-presented the same change as a conflict. Dev's text already combines both branches' wording (it kept dev's description of what snap does and folded in master's warning about the missing indexer), so dev's side was kept. Expect this to recur on future master → dev merges for the same reason.

Verification

  • Check Yaml, actionlint, and typos pass; the workflow's edited shell block parses under bash -n.
  • Confirmed Restore review fixes dropped from #808 and #810 #814's len(val) != 2 fix in dascore/utils/pd.py is still present and was not reverted by the merge.
  • Confirmed the new pre-release section of the release guide came across.
  • The diff against dev contains no Python changes, so the test suite is unaffected; CI will confirm.

Changelog

none

Checklist

I have (if applicable):

  • referenced the GitHub issue this PR closes. (No issue; keeps dev in sync with master.)
  • documented the new feature with docstrings and/or appropriate doc page.
  • included tests. See testing guidelines. (Workflow and docs only; no code change.)
  • added the "ready_for_review" tag once the PR is ready to be reviewed.

d-chambers and others added 3 commits August 4, 2026 21:16
Brings #825, which makes the stable docs workflow pre-release safe.

Two conflicts:

- build_deploy_stable_docs.yaml: dev carried the first version of the
  pre-release guard from #811; master now has #825's, which keys
  pre-release runs on their tag so publishing one cannot cancel
  another's build before it attaches docs.zip, and which stops a
  pre-release tag being picked as the stable docs version. Took
  master's, keeping dev's persist-credentials line.
- docs/tutorial/coords.qmd: #814 was squash merged into dev as #820, so
  master's commit is not an ancestor and git re-presented the same
  change. Dev's text already combines both branches' wording, so kept
  dev's.
@d-chambers d-chambers added documentation Improvements or additions to documentation ready_for_review PR is ready for review labels Aug 5, 2026
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, you can upgrade your account or add credits to your account and enable them for code reviews in your settings.

@coderabbitai

coderabbitai Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

@d-chambers, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 12 minutes

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: c24eca4b-2870-41b7-8518-a58558c86fb9

📥 Commits

Reviewing files that changed from the base of the PR and between acb25ca and e264f24.

📒 Files selected for processing (2)
  • .github/workflows/build_deploy_stable_docs.yaml
  • docs/contributing/publish_a_new_release.qmd

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@codecov

codecov Bot commented Aug 5, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 100.00%. Comparing base (acb25ca) to head (e264f24).

Additional details and impacted files
@@            Coverage Diff            @@
##               dev      #827   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          164       164           
  Lines        17916     17916           
=========================================
  Hits         17916     17916           
Flag Coverage Δ
network 48.49% <ø> (ø)
unittests 100.00% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@github-actions

github-actions Bot commented Aug 5, 2026

Copy link
Copy Markdown

✅ Documentation built:
👉 Download
Note: You must be logged in to github and a DASDAE member to access the link.

@d-chambers
d-chambers merged commit 3f4c83b into dev Aug 5, 2026
20 checks passed
@d-chambers
d-chambers deleted the sync-825-to-dev branch August 5, 2026 09:27
@d-chambers d-chambers removed the ready_for_review PR is ready for review label Aug 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant