forked from rstudio/rmarkdown
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge with latest RStudio version (2.9.1).
Merge remote-tracking branch 'rstudio_origin/master' into jg-devel * rstudio_origin/master: (64 commits) start the next version CRAN release v2.9 fix rstudio#2163: do not normalize web paths in the css argument of html output formats (rstudio#2164) Add a css file for future tests Restore previous shiny theme when run() exits (rstudio#2160) Correct name in workflow file Add a workflow to test Pandoc nighly (rstudio#2153) bslib 0.2.5.1 is now on CRAN use `stop2()` from knitr internal instead of `stop(..., call. = FALSE)` (rstudio#2152) 74e2f2f changed the error message, and a test relies on the content of this message (it probably shouldn't be so specific) tweak wording Support 'href' dependencies (rstudio#2151) Loop correctly on splitted file by file_scope function (rstudio#2150) update snapshot file following change in test name in a8aad75 amend 84ff469: clarify the meaning of fig_crop = 'auto' in the doc Add the position of the last character (rstudio#2146) don't put the checklist in the comment since it is required Fix for lost encoding in shiny_prerendered_html. (rstudio#2140) Insure fontawesome V4 compatibility in navbar (rstudio#1994) fix rstudio#2043: replace parse(text) with xfun::parse_only() to avoid hanging the R session when the input is empty ... # Conflicts: # DESCRIPTION # R/html_dependencies.R
- Loading branch information
Showing
69 changed files
with
1,072 additions
and
343 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| --- | ||
| name: "Bug report" | ||
| about: Report an error or unexpected behavior you saw while using this package | ||
| title: '' | ||
| labels: '' | ||
| assignees: '' | ||
| --- | ||
|
|
||
| <!-- | ||
| Welcome to the rmarkdown GitHub repo! | ||
| We are always happy to hear feedback from our users. | ||
| To file a _bug report_, please follow these instructions carefully: <https://yihui.org/issue/#bug-reports> | ||
| Also, please complete and keep the checklist below in your issue. This helps you know what to check for opening a good issue report. It also helps know that you've have done the common steps that can solve your potential issue. | ||
| At last, if you have posted the same issue elsewhere, please mentioned it (with a link to the other issue). | ||
| --> | ||
|
|
||
| ## Checklist | ||
|
|
||
| When filing a _bug report_, please check the boxes below to confirm that you have provided us with the information we need. Have you: | ||
|
|
||
| - [ ] [formatted your issue](https://yihui.org/issue/#please-format-your-issue-correctly) so it is easier for us to read? | ||
|
|
||
| - [ ] included a minimal, self-contained, and reproducible example? | ||
|
|
||
| - [ ] pasted the output from `xfun::session_info('rmarkdown')` in your issue? | ||
|
|
||
| - [ ] upgraded all your packages to their latest versions (including your versions of R, the RStudio IDE, and relevant R packages)? | ||
|
|
||
| - [ ] installed and tested your bug with the development version of the rmarkdown package using `remotes::install_github("rstudio/rmarkdown")`? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| blank_issues_enabled: false | ||
| contact_links: | ||
| - name: Issue guide | ||
| url: https://yihui.org/issue/ | ||
| about: First time here or need a refresh? Please consult the issue guide before posting. | ||
| - name: Ask a question on RStudio Community | ||
| url: https://community.rstudio.com/c/r-markdown/10 | ||
| about: Please ask and answer questions here. | ||
| - name: Ask a question on Stack Overflow | ||
| url: https://stackoverflow.com/questions/tagged/r+r-markdown | ||
| about: Please ask and answer questions here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| --- | ||
| name: "Feature request" | ||
| about: Suggest an idea for this package | ||
| title: '[FR]' | ||
| labels: '' | ||
| assignees: '' | ||
| --- | ||
|
|
||
| <!-- | ||
| Welcome to the rmarkdown GitHub repo 👋 | ||
| Thanks for taking the time to file a feature request! Please start by searching for an existing feature request to avoid creating duplicate requests. If you find an existing feature request, please give it a thumbs-up reaction, as we'll use these reactions to help prioritize the implementation of these features in the future. | ||
| If the feature has not yet been filed, follow these advice to write good feature request: | ||
| - Provide a clear and concise description of the problem this proposed feature would address? For example, I struggle to do `[...]` with rmarkdown. | ||
| - Try to detail what you want to happen. | ||
| - Have you thought of alternative solutions or workarounds you've considered ? We'll be glad to know about them! | ||
| - Any other context or screenshots about your feature request that would help us understand ? Please include them! | ||
| If you'd also like to offer a solution, you are welcome to submit a pull request, although we appreciate filing an issue first to confirm that the team agrees with your idea and is happy with your basic proposal. Please read this guide for more information: <https://yihui.org/issue/#proposing-a-feature-implementation-or-bug-fix> | ||
| --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| # For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag. | ||
| # https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions | ||
| on: | ||
| workflow_dispatch: | ||
| schedule: | ||
| - cron: '37 9 * * *' | ||
|
|
||
| name: R-CMD-check-daily-pandoc | ||
|
|
||
| jobs: | ||
| check: | ||
| runs-on: ${{ matrix.config.os }} | ||
| name: ${{ matrix.config.os }} (R release) [Pandoc devel] | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| config: | ||
| - {os: windows-latest} | ||
| - {os: macOS-latest} | ||
| - {os: ubuntu-18.04, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"} | ||
|
|
||
| env: | ||
| R_REMOTES_NO_ERRORS_FROM_WARNINGS: true | ||
| RSPM: ${{ matrix.config.rspm }} | ||
| GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - uses: r-lib/actions/setup-r@v1 | ||
| id: install-r | ||
|
|
||
| - name: change temp dir | ||
| if: runner.os == 'Windows' | ||
| run: echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV | ||
| shell: bash | ||
|
|
||
| - name: install pandoc devel | ||
| uses: cderv/actions/setup-pandoc-nightly@nightly-pandoc | ||
|
|
||
| - uses: r-lib/actions/setup-tinytex@v1 | ||
| env: | ||
| # install full prebuilt version | ||
| TINYTEX_INSTALLER: TinyTeX | ||
|
|
||
| - name: Add some R options for later steps | ||
| run: | | ||
| cat("\noptions(tinytex.verbose = TRUE)\n", file = "~/.Rprofile", append = TRUE) | ||
| cat(readLines("~/.Rprofile"), sep = "\n") | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Install pak and query dependencies | ||
| run: | | ||
| install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/") | ||
| saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds") | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Restore R package cache | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: | | ||
| ${{ env.R_LIBS_USER }}/* | ||
| !${{ env.R_LIBS_USER }}/pak | ||
| key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }} | ||
| restore-keys: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1- | ||
|
|
||
| - name: Install system dependencies | ||
| if: runner.os == 'Linux' | ||
| run: | | ||
| pak::local_system_requirements(execute = TRUE) | ||
| pak::pkg_system_requirements("rcmdcheck", execute = TRUE) | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| pak::local_install_dev_deps(upgrade = TRUE) | ||
| pak::pkg_install("rcmdcheck") | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Session info | ||
| run: | | ||
| options(width = 100) | ||
| pkgs <- .packages(TRUE) | ||
| sessioninfo::session_info(pkgs, include_base = TRUE) | ||
| rmarkdown::find_pandoc() | ||
| tinytex::tlmgr("--version") | ||
| tinytex::tl_pkgs() | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Check | ||
| env: | ||
| _R_CHECK_CRAN_INCOMING_: false | ||
| _R_CHECK_TESTS_NLINES_: 0 | ||
| run: | | ||
| options(crayon.enabled = TRUE) | ||
| rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Show testthat output | ||
| if: always() | ||
| run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true | ||
| shell: bash | ||
|
|
||
| - name: Upload check results | ||
| if: failure() | ||
| uses: actions/upload-artifact@main | ||
| with: | ||
| name: ${{ matrix.config.os }}-results | ||
| path: check |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,4 @@ inst/doc | |
| doc | ||
| Meta | ||
| docs | ||
| reference | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| Package: rmarkdown | ||
| Type: Package | ||
| Title: Dynamic Documents for R | ||
| Version: 2.7.2.9000 | ||
| Version: 2.9.1.9000 | ||
| Authors@R: c( | ||
| person("JJ", "Allaire", role = "aut", email = "[email protected]"), | ||
| person("Yihui", "Xie", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0003-0645-5666")), | ||
|
|
@@ -22,6 +22,7 @@ Authors@R: c( | |
| person("Barret", "Schloerke", role = "ctb"), | ||
| person("Carson", "Sievert", role = "ctb", comment = c(ORCID = "0000-0002-4958-2844")), | ||
| person("Christophe", "Dervieux", role = "ctb"), | ||
| person("Devon", "Ryan", role = "ctb", email = "[email protected]", comment = c(ORCID = "0000-0002-8549-0971")), | ||
| person("Frederik", "Aust", role = "ctb", email = "[email protected]", comment = c(ORCID = "0000-0003-4900-788X")), | ||
| person("Jeff", "Allen", role = "ctb", email = "[email protected]"), | ||
| person("JooYoung", "Seo", role="ctb", comment = c(ORCID = "0000-0002-4064-6012")), | ||
|
|
@@ -89,8 +90,8 @@ Imports: | |
| htmltools (>= 0.3.5), | ||
| evaluate (>= 0.13), | ||
| jsonlite, | ||
| tinytex (>= 0.11), | ||
| xfun (>= 0.15), | ||
| tinytex (>= 0.31), | ||
| xfun (>= 0.21), | ||
| methods, | ||
| stringr (>= 1.2.0) | ||
| Suggests: | ||
|
|
@@ -103,9 +104,9 @@ Suggests: | |
| tibble, | ||
| fs, | ||
| rsconnect, | ||
| withr (>= 2.3.0), | ||
| bslib (>= 0.2.4), | ||
| sass | ||
| withr (>= 2.4.2), | ||
| bslib (>= 0.2.5.1), | ||
| sass (>= 0.4.0) | ||
| SystemRequirements: pandoc (>= 1.14) - http://pandoc.org | ||
| URL: https://github.com/rstudio/rmarkdown, https://pkgs.rstudio.com/rmarkdown/ | ||
| BugReports: https://github.com/rstudio/rmarkdown/issues | ||
|
|
||
Oops, something went wrong.