Skip to content

Forward-merge: washr 1.0.2 patch release (CRAN bug fixes) - #89

Merged
larnsce merged 6 commits into
mainfrom
release/1.0.2
Jul 23, 2026
Merged

Forward-merge: washr 1.0.2 patch release (CRAN bug fixes)#89
larnsce merged 6 commits into
mainfrom
release/1.0.2

Conversation

@larnsce

@larnsce larnsce commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

Forward-merge gate from #66: brings the v1.0.2 fixes and their regression tests into main so they cannot be lost in the 1.1.0 rework. Built from release/1.0.2, cut from 11a29c4 (the 1.0.1 CRAN state). Closes #57, closes #58, closes #59, closes #60, closes #63, closes #64, closes #65.

Scope

Bug fixes only, zero new API, per the v1.0.2 milestone scope rule.

Fail-first evidence (#65)

All six bugs were first reproduced on the unfixed 11a29c4 code with the current toolchain (R 4.6.1, cffr 1.4.1, desc 1.4.3, usethis 3.2.1, testthat 3.3.2), confirming none of them had been fixed by dependency evolution; current cffr still writes inst/CITATION.bk1 on re-runs, and non-interactive setup_readme() still destroys a hand-written README. The 12 new regression tests were then run against the unfixed code: all 12 fail there and pass after the fixes.

Verification

  • devtools::test(): 52 pass, 0 fail, 0 warnings; suite is green on a second consecutive run with no leftover files
  • R CMD check (local, --no-manual): 0 errors, 0 warnings, 0 notes; the 52 tests pass inside the check

Notes for the merge

larnsce and others added 6 commits July 23, 2026 13:44
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>
@larnsce

larnsce commented Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

The conflict with main (DESCRIPTION and R/update_citation.R, from the metadata work on main) cannot be resolved by merging main into this branch without contaminating the CRAN submission base. The resolved merge lives in #90, done on the main side: main's structure kept, release side wins the version, maintainer change, date, and the update_citation() rewrite. Merging #90 makes this branch's tip reachable from main, which marks this PR merged automatically; release/1.0.2 stays untouched for the submission.

larnsce added a commit that referenced this pull request Jul 23, 2026
Forward-merge: release/1.0.2 into main with conflicts resolved (completes #89)
@larnsce
larnsce merged commit 72b1047 into main Jul 23, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment