From a6ae54c7d00a92529ce152b2c691a8eee429f860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sun, 27 Mar 2016 20:19:46 +0200 Subject: [PATCH 1/3] warn if NEWS.Rd exists --- R/check-devtools.r | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/R/check-devtools.r b/R/check-devtools.r index d175626a9..ab7af54eb 100644 --- a/R/check-devtools.r +++ b/R/check-devtools.r @@ -98,6 +98,13 @@ check_news_md <- function(pkg) { "NEWS.md is not ignored", "NEWS.md now supported by CRAN and doesn't need to be ignored." ) + + news_rd_path <- file.path(pkg$path, "inst/NEWS.Rd") + check_status( + !file.exists(news_rd_path), + "NEWS.Rd removed", + "NEWS.md now supported by CRAN, NEWS.Rd can be removed." + ) } check_remotes <- function(pkg) { From f0e0ab0e6523ae0835d4a46933209a65575327b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Mon, 28 Mar 2016 22:20:22 +0200 Subject: [PATCH 2/3] better error message --- R/check-devtools.r | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/check-devtools.r b/R/check-devtools.r index ab7af54eb..6a9c830a1 100644 --- a/R/check-devtools.r +++ b/R/check-devtools.r @@ -102,7 +102,7 @@ check_news_md <- function(pkg) { news_rd_path <- file.path(pkg$path, "inst/NEWS.Rd") check_status( !file.exists(news_rd_path), - "NEWS.Rd removed", + "NEWS.Rd does not exist", "NEWS.md now supported by CRAN, NEWS.Rd can be removed." ) } From a5a7d64f17ffdd9d590119b246b7b7cfdc6ac814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Mon, 28 Mar 2016 22:24:08 +0200 Subject: [PATCH 3/3] NEWS.md --- NEWS.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.md b/NEWS.md index 3aabfb88a..c471f737f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,6 +8,12 @@ * `create_description()` now sets `Encoding: UTF-8`. This helps non-English package authors (#1123). +* `release()` warns if both `inst/NEWS.Rd` and `NEWS.md` exist (@krlmlr, #1135). + +* `release()` doesn't throw error if Git head is detached (@krlmlr, #1136). + +* `use_cran_badge()` now uses HTTPS URL (@krlmlr, #1124). + * `uses_github()` now confirms that you've picked a good title and description (#1092).