Skip to content
Snippets Groups Projects
Commit d4b5bb4b authored by Kevin Ushey's avatar Kevin Ushey
Browse files

ensure 'pip' is used if virtualenv

parent 441b599d
No related branches found
No related tags found
No related merge requests found
......@@ -123,14 +123,21 @@ configure_environment <- function(package = NULL, force = FALSE) {
for (req in pkgreqs) {
# if no 'pip' requirement was specified, assume pip
pip <- req$pip
if (is.null(pip) || is.na(pip))
pip <- TRUE
# if this is a virtual environment, we cannot use conda
if (nzchar(config$virtualenv %||% ""))
pip <- TRUE
# normalize version request
version <- req$version
if (is.null(version) || is.na(version))
version <- NULL
components <- c(req$package, version)
if (pip) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment