Forward-merge: release/1.0.2 into main with conflicts resolved (completes #89) - #90
Merged
Conversation
Replace the undefined ui_abort() call with stop(), drop the usethis:::proj_get_() triple-colon in favor of a tryCatch on the public proj_get(), and remove the stray print() calls that echoed glue strings on every test run. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
#60) update_citation() now defaults doi to NULL: the pre-release call works without arguments and no DOI badge is injected when there is no DOI. add_citation_badge() replaces an existing DOI badge instead of duplicating it, heals the broken empty badge 1.0.1 could leave behind, and errors clearly when the badges-end marker is missing. The *.bk1 backup files cffr writes when overwriting CITATION.cff and inst/CITATION are removed after a successful write. All six regression tests were demonstrated to fail on the unfixed 1.0.1 code (R 4.6.1, cffr 1.4.1, desc 1.4.3, usethis 3.2.1). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
URL and Config/Needs/website entries are now unioned with the openwashdata defaults instead of being replaced, an existing license is left untouched (CC BY 4.0 is only set when no license is present), and the DESCRIPTION existence check honors the file argument. Replaces the vacuous DESCRIPTION-exists test with behavioral assertions and a full-file snapshot. The four regression tests for the destructive paths were demonstrated to fail on the unfixed 1.0.1 code. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
An existing README.Rmd now stops the function with an explicit error unless force = TRUE is passed. Previously a declined overwrite prompt (and any non-interactive call) still deleted the user's README and replaced it with the blank template. The decline-path regression test asserts the file survives byte-identical and was demonstrated to fail on the unfixed 1.0.1 code. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…#66) Version 1.0.2, refreshed Date, maintainer change from Colin Walder (now aut) to Lars Schöbitz (aut, cre); NEWS.md section and cran-comments.md with the explicit maintainer-change paragraph for the CRAN reviewer. Removed the dontshow example blocks that executed against tempdir() at check time and fixed the fill_dictionary() example that called a nonexistent update_dictionary() with a wrong argument name. The stale CRAN-SUBMISSION file (still 1.0.0) was deleted alongside the test helper cleanup. R CMD check: 0 errors, 0 warnings, 0 notes; 52 tests pass. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
#62) R-CMD-check now triggers on push and pull_request for dev and release/** in addition to main, with workflow_dispatch for manual re-runs. pkgdown builds on dev but the deploy step is now explicitly gated to main, so dev pushes cannot overwrite the published site. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
… fixes (#89) Resolves the two conflicts from main's metadata work: - DESCRIPTION: main's expanded structure kept (full Imports, reflowed Description); release side wins Version 1.0.2, maintainer change (Colin Walder aut, Lars Schoebitz aut + cre), Date 2026-07-23, and the roxygen2 8.0.0 version field - R/update_citation.R: release side taken wholesale (doi optional, idempotent badge insertion, clear badges-end-marker error, cffr backup cleanup), superseding main's cosmetic edits Verified: devtools::test() 52 pass, 0 fail, 0 warnings on the merged tree. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
main carries unreleased exports beyond the 1.0.2 CRAN state, so it moves past the release version as anticipated in the PR #89 notes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This was referenced Jul 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Completes the forward-merge gate from #66. PR #89 (release/1.0.2 into main) shows merge conflicts because main's metadata work diverged from the 1.0.1 CRAN state the release branch was cut from. Resolving those conflicts by merging main into release/1.0.2 would contaminate the CRAN submission base, so the resolution lives here instead: a merge of release/1.0.2 into main done on the main side. Merging this PR makes the release branch tip reachable from main, which marks #89 merged automatically; release/1.0.2 itself stays untouched.
Conflict resolution
Version bump
Second commit bumps main to 1.0.2.9000 with a development-version NEWS.md heading, per the #89 notes: main carries unreleased exports beyond the 1.0.2 CRAN state, so it moves past the release version after the merge.
Verification
CRAN submission still happens from release/1.0.2 after the #61 maintainer handover is confirmed; this PR only closes the forward-merge gate so the fixes and tests cannot be lost in the 1.1.0 rework.