Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,9 @@ Suggests:
DT (>= 0.23),
foghorn (>= 1.4.2),
gh (>= 1.3.0),
gmailr (>= 1.0.1),
httr (>= 1.4.3),
knitr (>= 1.39),
lintr (>= 3.0.0),
MASS,
mockery (>= 0.4.3),
pingr (>= 2.0.1),
rhub (>= 1.1.1),
rmarkdown (>= 2.14),
rstudioapi (>= 0.13),
spelling (>= 2.2)
Expand Down
10 changes: 0 additions & 10 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ export(uses_testthat)
export(wd)
export(with_debug)
import(fs)
importFrom(cli,cat_bullet)
importFrom(cli,cat_rule)
importFrom(ellipsis,check_dots_used)
importFrom(lifecycle,deprecated)
importFrom(memoise,memoise)
Expand Down Expand Up @@ -120,11 +118,3 @@ importFrom(usethis,ui_path)
importFrom(usethis,ui_todo)
importFrom(usethis,ui_value)
importFrom(usethis,use_test)
importFrom(utils,available.packages)
importFrom(utils,contrib.url)
importFrom(utils,install.packages)
importFrom(utils,installed.packages)
importFrom(utils,modifyList)
importFrom(utils,packageDescription)
importFrom(utils,packageVersion)
importFrom(utils,remove.packages)
4 changes: 2 additions & 2 deletions R/check-devtools.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
#' @export
release_checks <- function(pkg = ".", built_path = NULL) {
pkg <- as.package(pkg)
cat_rule(paste0("Running additional devtools checks for ", pkg$package))
cli::cat_rule(paste0("Running additional devtools checks for ", pkg$package))

check_version(pkg)
check_dev_versions(pkg)
check_vignette_titles(pkg)
check_news_md(pkg)
check_remotes(pkg)

cat_rule()
cli::cat_rule()
}

check_dev_versions <- function(pkg = ".") {
Expand Down
4 changes: 2 additions & 2 deletions R/check-git.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#' @keywords internal
git_checks <- function(pkg = ".") {
pkg <- as.package(pkg)
cat_rule(paste0("Running Git checks for ", pkg$package))
cli::cat_rule(paste0("Running Git checks for ", pkg$package))

git_report_branch(pkg)
git_check_uncommitted(pkg)
cat_rule()
cli::cat_rule()
}

git_report_branch <- function(pkg) {
Expand Down
10 changes: 5 additions & 5 deletions R/check.R
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ check <- function(
document <- document %||% can_document(pkg$roxygennote)
if (document) {
if (!quiet) {
cat_rule("Documenting", col = "cyan", line = 2)
cli::cat_rule("Documenting", col = "cyan", line = 2)
}
document(pkg, quiet = quiet)
if (!quiet) {
Expand All @@ -94,7 +94,7 @@ check <- function(
}

if (!quiet) {
cat_rule("Building", col = "cyan", line = 2)
cli::cat_rule("Building", col = "cyan", line = 2)
show_env_vars(pkgbuild::compiler_flags(FALSE))
}

Expand Down Expand Up @@ -133,7 +133,7 @@ check <- function(
)
}

can_document <- function(required, installed = packageVersion("roxygen2")) {
can_document <- function(required, installed = utils::packageVersion("roxygen2")) {
if (is.null(required)) {
return(FALSE)
}
Expand Down Expand Up @@ -222,7 +222,7 @@ check_built <- function(

env_vars <- check_env_vars(cran, remote, incoming, force_suggests, env_vars)
if (!quiet) {
cat_rule("Checking", col = "cyan", line = 2)
cli::cat_rule("Checking", col = "cyan", line = 2)
show_env_vars(env_vars)
}

Expand Down Expand Up @@ -271,7 +271,7 @@ aspell_env_var <- function() {

show_env_vars <- function(env_vars) {
cli::cat_line("Setting env vars:", col = "darkgrey")
cat_bullet(
cli::cat_bullet(
paste0(format(names(env_vars)), ": ", unname(env_vars)),
col = "darkgrey"
)
Expand Down
8 changes: 4 additions & 4 deletions R/release.R
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ release <- function(pkg = ".", check = FALSE, args = NULL) {
}

if (check) {
cat_rule(
cli::cat_rule(
left = "Building and checking",
right = pkg$package,
line = 2
Expand Down Expand Up @@ -74,9 +74,9 @@ release <- function(pkg = ".", check = FALSE, args = NULL) {
if (show_cran_check) {
if (!is.null(cran_details)) {
end_sentence <- "\n shown above?"
cat_rule(paste0("Details of the CRAN check results for ", pkg$package))
cli::cat_rule(paste0("Details of the CRAN check results for ", pkg$package))
summary(cran_details)
cat_rule()
cli::cat_rule()
}
cran_url <- paste0(
cran_mirror(),
Expand Down Expand Up @@ -385,7 +385,7 @@ cran_mirror <- function(repos = getOption("repos")) {
# Return the version of a package on CRAN (or other repository)
# @param package The name of the package.
# @param available A matrix of information about packages.
cran_pkg_version <- function(package, available = available.packages()) {
cran_pkg_version <- function(package, available = utils::available.packages()) {
idx <- available[, "Package"] == package
if (any(idx)) {
as.package_version(available[package, "Version"])
Expand Down
2 changes: 1 addition & 1 deletion R/run-examples.R
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ run_examples <- function(
return()
}

cat_rule(
cli::cat_rule(
left = paste0("Running ", length(files), " example files"),
right = pkg$package
)
Expand Down
4 changes: 2 additions & 2 deletions R/sitrep.R
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ dev_sitrep <- function(pkg = ".", debug = FALSE) {
r_release_version = r_release(),
has_build_tools = has_build_tools,
rtools_path = if (has_build_tools) pkgbuild::rtools_path(),
devtools_version = packageVersion("devtools"),
devtools_version = utils::packageVersion("devtools"),
devtools_deps = remotes::package_deps("devtools", dependencies = NA),
pkg_deps = if (!is.null(pkg)) {
remotes::dev_package_deps(pkg$path, dependencies = TRUE)
Expand Down Expand Up @@ -211,7 +211,7 @@ print.dev_sitrep <- function(x, ...) {
# Helpers -----------------------------------------------------------------

hd_line <- function(name) {
cat_rule(cli::style_bold(name))
cli::cat_rule(cli::style_bold(name))
}

kv_line <- function(key, value, path = FALSE) {
Expand Down
2 changes: 1 addition & 1 deletion R/uninstall.R
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ uninstall <- function(
cli::cli_inform(c(i = "Uninstalling {.pkg {pkg$package}}"))
}

remove.packages(pkg$package, .libPaths()[[1]])
utils::remove.packages(pkg$package, .libPaths()[[1]])

invisible(TRUE)
}
4 changes: 0 additions & 4 deletions R/zzz.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#' @importFrom utils available.packages contrib.url install.packages
#' installed.packages modifyList packageDescription
#' packageVersion remove.packages
#' @importFrom cli cat_rule cat_bullet
#' @import fs
NULL

Expand Down