Merge pull request #209 from ThinkR-open/branch-0.4.2

Branch 0.4.2

Author: statnmap

.github/workflows/R-CMD-check-devel.yaml

@@ -6,10 +6,12 @@ on:
       - main
       - master
       - tmate
+      - production-cran
   pull_request:
     branches:
       - main
       - master
+      - production-cran
 
 name: R-CMD-check-devel
 

.github/workflows/R-CMD-check.yaml

@@ -6,10 +6,12 @@ on:
       - main
       - master
       - tmate
+      - production-cran
   pull_request:
     branches:
       - main
       - master
+      - production-cran
 
 name: R-CMD-check
 

.github/workflows/pkgdown.yaml

@@ -2,7 +2,7 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [main, master]
+    branches: [main, master, production-cran]
     tags: ['*']
 
 name: pkgdown

.github/workflows/test-coverage.yaml

@@ -2,9 +2,9 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [main, master]
+    branches: [main, master, production-cran]
   pull_request:
-    branches: [main, master]
+    branches: [main, master, production-cran]
 
 name: test-coverage
 

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: fusen
 Title: Build a Package from Rmarkdown Files
-Version: 0.4.1
+Version: 0.4.2
 Authors@R: c(
     person("Sebastien", "Rochette", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-1565-9313")),
@@ -49,4 +49,4 @@ Encoding: UTF-8
 Language: en-US
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.2

NEWS.md

@@ -1,3 +1,9 @@
+# fusen 0.4.2
+
+## Bug
+
+- Replacement of unexported usethis functions (#205, @ateucher)
+
 # fusen 0.4.1
 
 ## New features

R/inflate.R

@@ -536,9 +536,11 @@ create_vignette <- function(parsed_tbl, pkg, relative_flat_file, vignette_name,
   yaml_options <- flat_yaml[["ast"]][[1]]
   # Vignette
   # Copied from usethis::use_vignette() to allow to not open vignette created
-  # usethis:::use_dependency("knitr", "Suggests")
-  getFromNamespace("use_dependency", "usethis")("knitr", "Suggests")
-  getFromNamespace("use_description_field", "usethis")("VignetteBuilder", "knitr", overwrite = TRUE)
+  usethis::use_package("knitr", "Suggests")
+  # desc <- desc::desc(file = usethis::proj_get())
+  desc <- desc::desc(file = pkg)
+  desc$set("VignetteBuilder", "knitr")
+  desc$write()
   usethis::use_git_ignore("inst/doc")
 
   # Vignette head

dev/cran-comments-history.md

@@ -0,0 +1,15 @@
+# v0.4.2
+## R CMD check results
+
+0 errors | 0 warnings | 0 note
+
+* This is a patch to fix problem with the new version of {usethis}
+* This fixes errors in https://cran.r-project.org/web/checks/check_results_fusen.html
+* Tested on rhub, winbuilder and macbuilder
+
+# v0.4.1
+## R CMD check results
+
+0 errors | 0 warnings | 0 note
+
+* This is a new release.

tests/testthat/test-inflate-part2.R

@@ -56,7 +56,7 @@ dir.create(alltemp)
 for (pkgname in c("full", "teaching", "minimal")) {
   # No "additional" with create_fusen
   # {fusen} steps
-  path_foosen <- normalize_path_winslash(file.path(alltemp, pkgname))
+  path_foosen <- normalize_path_winslash(file.path(alltemp, pkgname), mustWork = FALSE)
   dev_file <- create_fusen(path_foosen, template = pkgname, open = FALSE)
   flat_file <- dev_file[grepl("flat_", dev_file)]
 

tests/testthat/test-inflate_utils.R

@@ -58,7 +58,7 @@ usethis::with_project(dummypackage, {
     expect_equal(is_pkg_proj(dummypackage), FALSE)
   })
 
-  cat("BuildType: Package", file = file.path(dummypackage, "dummy.Rproj"))
+  cat("BuildType: Package\n", file = file.path(dummypackage, "dummy.Rproj"))
 
   test_that("is_pkg_proj works when rproj is pkg", {
     expect_equal(is_pkg_proj(dummypackage), TRUE)