Merge branch 'main' into cache-engine

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

@@ -61,7 +61,10 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: rcmdcheck remotes yihui/knitr#2170
+          extra-packages: rcmdcheck remotes local::.
+          cache-version: 2
+          upgrade: 'TRUE'
+
 
       - name: setup r-reticulate venv
         shell: Rscript {0}
@@ -70,7 +73,7 @@ jobs:
           reticulate::virtualenv_create("r-reticulate", Sys.which("python"))
           reticulate::virtualenv_install("r-reticulate",
             c("docutils", "pandas", "scipy", "matplotlib", "ipython",
-              "tabulate", "plotly", "psutil", "kaleido", "dill"))
+              "tabulate", "plotly", "psutil", "kaleido", "wrapt", "dill"))
           python <- reticulate::virtualenv_python("r-reticulate")
           writeLines(sprintf("RETICULATE_PYTHON=%s", python),
                      Sys.getenv("GITHUB_ENV"))

tests/testthat/test-python-knitr-engine.R

@@ -23,3 +23,42 @@ test_that("An R Markdown document can be rendered using reticulate", {
 
   expect_true(file.exists(output), "example.Rmd rendered successfully")
 })
+
+
+
+test_that("In Rmd chunks, comments and output attach to code correctly", {
+
+  skip_on_cran()
+  skip_if_not_installed("rmarkdown")
+  skip_if(py_version() < "3.8") # end_lineno attr added in 3.8
+
+  local_edition(3) # needed for expect_snapshot_file()
+  # TODO: update the full testsuite to testthat edition 3
+
+  owd <- setwd(test_path("resources"))
+  rmarkdown::render("test-chunking.Rmd")
+
+  expect_snapshot_file("test-chunking.md")
+  setwd(owd)
+
+})
+
+
+test_that("knitr 'warning=FALSE' option", {
+
+  skip_on_cran()
+  skip_if_not_installed("rmarkdown")
+
+  local_edition(3) # needed for expect_snapshot_file()
+
+  owd <- setwd(test_path("resources"))
+  rmarkdown::render("knitr-warn.Rmd")
+  setwd(owd)
+
+  rendered <- test_path("resources", "knitr-warn.md")
+  res <- paste0(readLines(rendered), collapse = "\n")
+
+  expect_snapshot_file(rendered)
+  expect_no_match(res, "UserWarning", fixed = TRUE)
+
+})