Skip to content

Commit

Permalink
move servr from Suggests to Imports
Browse files Browse the repository at this point in the history
  • Loading branch information
tdhock committed Dec 15, 2023
1 parent aa46d0d commit b61ad51
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Description: Functions are provided for defining animated,
Depends:
R (>= 3.4.0)
Imports:
servr,
digest,
RJSONIO,
grid,
Expand All @@ -75,7 +76,6 @@ Imports:
data.table (>= 1.9.8),
methods
Suggests:
servr,
gert, gitcreds, gh,
sp,
gistr (>= 0.2),
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changes in version 2023.12.14 (PR#112)

- move servr from Suggests to Imports, for more user-friendly installation / getting started for newbies (no need for separate install command for servr).
- bugfix in compiler height_proportion computation, which occured in ggplots with space=free and both vertical/horizontal panels. Before the vertical panels were always the same size, now they can be different sizes.

# Changes in version 2023.11.21
Expand Down
9 changes: 2 additions & 7 deletions R/z_animint.R
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ storeLayer <- function(meta, g, g.data.varied){
#' determine how. If it is set to "browseURL" then we use a file URL
#' (be sure to configure your browser to allow access to local
#' files, as some browsers block this by default). Otherwise
#' (default) if servr package is installed, we use
#' \code{servr::httd(out.dir)}.
#' (default) we use \code{servr::httd(out.dir)}.
#' @param css.file character string for non-empty css file to
#' include. Provided file will be copied to the output directory as
#' styles.css
Expand Down Expand Up @@ -658,11 +657,7 @@ animint2dir <- function(plot.list, out.dir = NULL,
u <- normalizePath(file.path(out.dir, "index.html"))
browseURL(u)
} else {
if (requireNamespace("servr")){
servr::httd(normalizePath(out.dir,winslash="/"))
} else {
warning('open.browser=TRUE but servr package not installed; try install.packages("servr") or options(animint.browser="browseURL")')
}
servr::httd(normalizePath(out.dir,winslash="/"))
}
}

Expand Down
3 changes: 1 addition & 2 deletions man/animint2dir.Rd

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

0 comments on commit b61ad51

Please sign in to comment.