Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Keep only raw NEWS #827

Merged
merged 3 commits into from
Nov 23, 2024
Merged

feat: Keep only raw NEWS #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69ff9d9
Avoid escaping hash tag
krlmlr Nov 23, 2024
efc0373
Get old news from raw
krlmlr Nov 23, 2024
16bc438
Avoid storing versions
krlmlr Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions R/fledgling.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ read_news <- function(news_lines = NULL) {
end = ends,
h2 = grepl("##", news_lines[starts]), # TODO does not account for all syntaxes,
raw = map2_chr(starts, ends, ~ paste(news_lines[seq2(.x, .y)], collapse = "\n")),
versions = versions,
section_state = "keep",
title = names(versions),
parse_versions(names(versions))[, c("version", "date", "nickname")],
Expand Down Expand Up @@ -124,7 +123,6 @@ read_news <- function(news_lines = NULL) {
}

parse_news_md <- function(news) {
news <- protect_hashtag(news)
versions <- versions_from_news(news)
if (is.null(versions)) {
return(NULL)
Expand Down
4 changes: 2 additions & 2 deletions R/update-news.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ add_news_to_fledgeling_samedev <- function(fledgeling, news_lines) {
section_state = "new"
)
} else {
old_news <- news_from_versions(fledgeling[["news"]]$versions[1])[[1]]
old_news <- news_from_versions(parse_news_md(fledgeling[["news"]]$raw[[1]]))[[1]]
combined <- c(parse_news_lines(news_lines), old_news)
combined <- purrr::discard(combined, purrr::is_empty)
regrouped <- regroup_news(combined)
Expand Down Expand Up @@ -106,7 +106,7 @@ add_news_to_fledgeling <- function(
}

if (dev_header_present) {
old_news <- news_from_versions(fledgeling[["news"]]$versions[1])[[1]]
old_news <- news_from_versions(parse_news_md(fledgeling[["news"]]$raw[[1]]))[[1]]
combined <- c(parse_news_lines(news_lines), old_news)
combined <- purrr::discard(combined, purrr::is_empty)
news <- regroup_news(combined)
Expand Down
10 changes: 0 additions & 10 deletions tests/testthat/_snaps/fledgling.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"end": 8,
"h2": false,
"raw": "# fledge v2.0.0\n\n* blop\n\n* lala\n",
"versions": "<section id=\"fledge-v200\" class=\"level1\">",
"section_state": "keep",
"title": "fledge v2.0.0",
"version": "2.0.0",
Expand All @@ -19,7 +18,6 @@
"end": 14,
"h2": false,
"raw": "# fledge v1.0.0\n\n* blip\n\n* lili\n",
"versions": "<section id=\"fledge-v100\" class=\"level1\">",
"section_state": "keep",
"title": "fledge v1.0.0",
"version": "1.0.0",
Expand All @@ -40,7 +38,6 @@
"end": 9,
"h2": false,
"raw": "# Changes in v2.0.0\n\n* blop\n\n* lala\n\n",
"versions": "<section id=\"changes-in-v200\" class=\"level1\">",
"section_state": "keep",
"title": "Changes in v2.0.0",
"version": "2.0.0",
Expand All @@ -52,7 +49,6 @@
"end": 15,
"h2": false,
"raw": "# Changes in v1.0.0\n\n* blip\n\n* lili\n",
"versions": "<section id=\"changes-in-v100\" class=\"level1\">",
"section_state": "keep",
"title": "Changes in v1.0.0",
"version": "1.0.0",
Expand All @@ -73,7 +69,6 @@
"end": 8,
"h2": false,
"raw": "# Changes in v2.0.0 \"Vigorous Calisthenics\"\n\n* blop\n\n* lala\n",
"versions": "<section id=\"changes-in-v200-vigorous-calisthenics\" class=\"level1\">",
"section_state": "keep",
"title": "Changes in v2.0.0 \"Vigorous Calisthenics\"",
"version": "2.0.0",
Expand All @@ -85,7 +80,6 @@
"end": 14,
"h2": false,
"raw": "# Changes in v1.0.0 \"Pumpkin Helmet\"\n\n* blip\n\n* lili\n",
"versions": "<section id=\"changes-in-v100-pumpkin-helmet\" class=\"level1\">",
"section_state": "keep",
"title": "Changes in v1.0.0 \"Pumpkin Helmet\"",
"version": "1.0.0",
Expand All @@ -106,7 +100,6 @@
"end": 8,
"h2": true,
"raw": "## Changes in v2.0.0 \"Vigorous Calisthenics\"\n\n* blop\n\n* lala\n",
"versions": "<section id=\"changes-in-v200-vigorous-calisthenics\" class=\"level2\">",
"section_state": "keep",
"title": "Changes in v2.0.0 \"Vigorous Calisthenics\"",
"version": "2.0.0",
Expand All @@ -118,7 +111,6 @@
"end": 14,
"h2": true,
"raw": "## Changes in v1.0.0 \"Pumpkin Helmet\"\n\n* blip\n\n* lili\n",
"versions": "<section id=\"changes-in-v100-pumpkin-helmet\" class=\"level2\">",
"section_state": "keep",
"title": "Changes in v1.0.0 \"Pumpkin Helmet\"",
"version": "1.0.0",
Expand All @@ -139,7 +131,6 @@
"end": 7,
"h2": false,
"raw": "fledge v2.0.0\n=============\n\n* blop\n\n* lala\n",
"versions": "<section id=\"fledge-v200\" class=\"level1\">",
"section_state": "keep",
"title": "fledge v2.0.0",
"version": "2.0.0",
Expand All @@ -151,7 +142,6 @@
"end": 13,
"h2": false,
"raw": "# fledge v1.0.0\n\n* blip\n\n* lili\n",
"versions": "<section id=\"fledge-v100\" class=\"level1\">",
"section_state": "keep",
"title": "fledge v1.0.0",
"version": "1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions tests/testthat/_snaps/update-news.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
[1] "<!-- NEWS.md is maintained by https://fledge.cynkra.com, contributors should not edit this file -->"

$news
# A tibble: 1 x 10
# A tibble: 1 x 9
start end h2
<int> <int> <lgl>
1 3 6 FALSE
raw
<chr>
1 "# tea 0.0.1 (2023-01-23)\n\n- Added a `NEWS.md` file to track changes to the~
versions section_state title version date nickname
<named list> <chr> <chr> <chr> <chr> <chr>
1 <xml_node> keep tea 0.0.1 (2023-01-23) 0.0.1 (2023-01-2~ <NA>
section_state title version date nickname
<chr> <chr> <chr> <chr> <chr>
1 keep tea 0.0.1 (2023-01-23) 0.0.1 (2023-01-23) <NA>

$preamble_in_file
[1] TRUE
Expand Down