Skip to content

Add QUARTO_KNITR_RSCRIPT_ARGS to pass some flags to RScript for knitr engine #11337

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

Merged
merged 4 commits into from
Nov 14, 2024
Merged

Add QUARTO_KNITR_RSCRIPT_ARGS to pass some flags to RScript for knitr engine #11337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11a8898
Add QUARTO_KNITR_RSCRIPT_ARGS environment variable
cderv Nov 7, 2024
c0b9f44
don't use `--vanilla` in test as we rely on it for renv in test envir…
cderv Nov 7, 2024
c64046a
fix typo
cderv Nov 7, 2024
4007a9d
Remove tests and helpers that try to setup / teardown and env var for…
cderv Nov 8, 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
8 changes: 8 additions & 0 deletions src/execute/rmd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,19 @@ async function callR<T>(
wd: cwd,
});

// QUARTO_KNITR_RSCRIPT_ARGS allows to pass additional arguments to Rscript as comma separated values
// e.g. QUARTO_KNITR_RSCRIPT_ARGS="--vanilla,--no-init-file,--max-connections=258"
const rscriptArgs = Deno.env.get("QUARTO_KNITR_RSCRIPT_ARGS") || "";
const rscriptArgsArray = rscriptArgs.split(",").filter((a) =>
a.trim() !== ""
);

try {
const result = await execProcess(
{
cmd: [
await rBinaryPath("Rscript"),
...rscriptArgsArray,
resourcePath("rmd/rmd.R"),
],
cwd,
Expand Down
50 changes: 0 additions & 50 deletions tests/smoke/render/render-required.test.ts
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions tests/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export function outputForInput(
if (baseFormat === "revealjs") {
outputExt = "html";
}
if (["commonmark", "gfm", "markdown"].some((f) => f === baseFormat)) {
if (["commonmark", "gfm", "markdown", "markdown_strict"].some((f) => f === baseFormat)) {
outputExt = "md";
}
if (baseFormat === "csljson") {
Expand Down Expand Up @@ -189,4 +189,5 @@ export function fileLoader(...path: string[]) {
// On Windows, `quarto.cmd` needs to be explicit in `execProcess()`
export function quartoDevCmd(): string {
return Deno.build.os === "windows" ? "quarto.cmd" : "quarto";
}
}

Loading