Skip to content

Commit

Permalink
Switch to a different hack to see if it builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
LTLA committed Dec 12, 2019
1 parent 4e784df commit 89989f0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: basilisk
Version: 0.99.3
Date: 2019-12-11
Version: 0.99.4
Date: 2019-12-12
Title: Freezing Python Versions Inside Bioconductor Packages
Authors@R: c(person("Aaron", "Lun", role=c("aut", "cre", "cph"),
email="infinite.monkeys.with.keyboards@gmail.com"))
Expand Down
15 changes: 7 additions & 8 deletions R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@
return(NULL)
}

# NOTE: temporary hack to skip failure in temporary installation during R
# CMD build, so the vignettes can be built and we can proceed to the actual
# installation.
if (nrow(utils::vignette(package="basilisk")$results)==0L) {
return(NULL)
}

.minstaller(dest_path, testing=FALSE)

# Create a common virtual environment.
Expand Down Expand Up @@ -56,7 +49,13 @@
file.symlink(dest_path2, dest_path)
} else {
tmploc <- .expedient_download(file.path(base_url, inst_file))
inst_args <- sprintf(" %s -b -p %s", tmploc, dest_path)

if (os=="macosx") {
# NOTE: another hack to check why Anaconda doesn't want to install on a mac.
inst_args <- sprintf(" %s -b", tmploc)
} else {
inst_args <- sprintf(" %s -b -p %s", tmploc, dest_path)
}
system2("bash", inst_args)
}
}
Expand Down

0 comments on commit 89989f0

Please sign in to comment.