Skip to content
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

Jump to bottom

chore: clean roxygen doc and test tempfiles #80

Merged
merged 1 commit into from
Aug 12, 2024
Merged

chore: clean roxygen doc and test tempfiles #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .Rbuildignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ tests/testthat/.dockerignore
^cran-comments\.md$
^CRAN-SUBMISSION$
^revdep$
^doc$
^Meta$
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
.RData
inst/doc
revdep/
/doc/
/Meta/
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ Config/testthat/edition: 3
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion R/add.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#' @importFrom glue glue
#' @importFrom attempt warn_if_not

#' @noRd
create_dockerfile <- function(
FROM = "rocker/r-base",
AS = NULL
Expand Down
2 changes: 1 addition & 1 deletion R/dock_from_desc.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ quote_not_na <- function(x){
#' @importFrom usethis use_build_ignore
#' @importFrom pkgbuild build
#'
#' @export
#' @return Dockerfile
dock_from_desc <- function(
path = "DESCRIPTION",
FROM = paste0(
Expand Down
1 change: 1 addition & 0 deletions R/dock_from_renv.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# WARNING - Generated by {fusen} from dev/flat_dock_from_renv.Rmd: do not edit by hand

#' @importFrom memoise memoise
#' @noRd
pkg_sysreqs_mem <- memoise::memoise(
pak::pkg_sysreqs
)
Expand Down
2 changes: 1 addition & 1 deletion R/parse-dockerfile.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#' Create a Dockerfile object from a Dockerfile.
#'
#' @param path path to the Dockerfile
#' @returns A Dockerfile object
#' @return A Dockerfile object
#' @export
#' @examples
#' parse_dockerfile(system.file("Dockerfile", package = "dockerfiler"))
Expand Down
3 changes: 3 additions & 0 deletions R/utils.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set_name <- function(x, y) {
}

#' @importFrom cli cat_bullet
#' @noRd
cat_green_tick <- function(...) {
cat_bullet(
...,
Expand All @@ -13,6 +14,7 @@ cat_green_tick <- function(...) {
}

#' @importFrom cli cat_bullet
#' @noRd
cat_red_bullet <- function(...) {
cat_bullet(
...,
Expand All @@ -22,6 +24,7 @@ cat_red_bullet <- function(...) {
}

#' @importFrom cli cat_bullet
#' @noRd
cat_info <- function(...) {
cat_bullet(
...,
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ knitr::opts_chunk$set(

<!-- badges: start -->
[![R-CMD-check](https://github.com/ThinkR-open/dockerfiler/workflows/R-CMD-check/badge.svg)](https://github.com/ThinkR-open/dockerfiler/actions)
[![Coverage status](https://codecov.io/gh/ThinkR-open/dockerfiler/branch/master/graph/badge.svg)](https://codecov.io/github/ThinkR-open/dockerfiler?branch=master)
[![Coverage status](https://codecov.io/gh/ThinkR-open/dockerfiler/branch/master/graph/badge.svg)](https://app.codecov.io/github/ThinkR-open/dockerfiler?branch=master)
<!-- badges: end -->


Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[![R-CMD-check](https://github.com/ThinkR-open/dockerfiler/workflows/R-CMD-check/badge.svg)](https://github.com/ThinkR-open/dockerfiler/actions)
[![Coverage
status](https://codecov.io/gh/ThinkR-open/dockerfiler/branch/master/graph/badge.svg)](https://codecov.io/github/ThinkR-open/dockerfiler?branch=master)
status](https://codecov.io/gh/ThinkR-open/dockerfiler/branch/master/graph/badge.svg)](https://app.codecov.io/github/ThinkR-open/dockerfiler?branch=master)
<!-- badges: end -->

# `{dockerfiler}`
Expand Down
7 changes: 3 additions & 4 deletions dev/flat_dock_from_renv.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ if (!is.null(distro)){

```{r function-dock_from_renv}
#' @importFrom memoise memoise
#' @noRd
pkg_sysreqs_mem <- memoise::memoise(
pak::pkg_sysreqs
)
Expand Down Expand Up @@ -411,10 +412,6 @@ skip_if(is_rdevel, "skip on R-devel")





unlink(dir_build)

# repos_as_character ----
test_that("repos_as_character works", {
out <- dockerfiler:::repos_as_character(
Expand Down Expand Up @@ -498,6 +495,8 @@ socle_install_version <- "remotes::install_version\\(\"renv\", version = \""

})

unlink(dir_build, recursive = TRUE)

```


Expand Down
3 changes: 3 additions & 0 deletions man/dockerfiles.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions tests/testthat/test-dock_from_desc.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,12 @@ withr::with_dir(
)
)

unlink(tpf, recursive = TRUE)



})
}
)

unlink(descdir, recursive = TRUE)
6 changes: 2 additions & 4 deletions tests/testthat/test-dock_from_renv.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,6 @@ skip_if(is_rdevel, "skip on R-devel")





unlink(dir_build)

# repos_as_character ----
test_that("repos_as_character works", {
out <- dockerfiler:::repos_as_character(
Expand Down Expand Up @@ -203,3 +199,5 @@ socle_install_version <- "remotes::install_version\\(\"renv\", version = \""

})

unlink(dir_build, recursive = TRUE)

Loading