Skip to content

Commit

Permalink
Merge pull request #4 from davidkane9/master
Browse files Browse the repository at this point in the history
merge, will release on Github soon
  • Loading branch information
knightsay committed Aug 6, 2015
2 parents 56938b1 + 8478fd1 commit 888b00a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .Rprofile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
local({r <- getOption("repos"); r["CRAN"] <- "https://cran.cnr.Berkeley.edu/"; options(repos = r)})
options(repos = c(CRAN="http://cran.r-project.org")
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: creditr
Version: 0.4-3
Date: 2015-08-02
Version: 0.4-4
Date: 2015-08-06
Title: Credit Default Swaps in R
Author: c(person("Heidi", "Chen", role = c("aut"),
email = "[email protected]"),
Expand Down Expand Up @@ -34,4 +34,4 @@ Description: The creditr package provides tools for pricing credit default
See "http://www.cdsmodel.com/cdsmodel/cds-disclaimer.html" for details.
The R package "creditrISDA" at "https://github.com/davidkane9/creditrISDA"
is needed because the ISDA C code can not be placed in a CRAN package.
LazyData: true
LazyData: true
12 changes: 7 additions & 5 deletions R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@

#' @importFrom utils packageVersion

.onLoad <- function(libname, pkgname) {
requireNamespace("utils")
if(!"creditrISDA" %in% .packages(all.available = TRUE)){
devtools::install_github("davidkane9/creditrISDA")
}
if(!"creditrISDA" %in% .packages(all.available = TRUE)){
devtools::install_github("davidkane9/creditrISDA")
}


## compress the vignette PDF to fix CMD Check WARNING
## The below works and please don't delete this!

Expand All @@ -20,3 +18,7 @@ Sys.setenv("_R_BUILD_COMPACT_VIGNETTES_" = "--compress-vignettes=gs+qpdf")
## probably setting R_WIN_NO_JUNCTIONS to non-empty value will fix the NOTE??

Sys.setenv("R_WIN_NO_JUNCTIONS" = "repos")

## do not check suggests package (creditrISDA) dependency

Sys.setenv("_R_CHECK_FORCE_SUGGESTS_" = FALSE)

0 comments on commit 888b00a

Please sign in to comment.