Fixes for Rv3.4 for CRAN submissions

Author: graemeleehickey

DESCRIPTION

@@ -2,7 +2,7 @@ Package: joineRML
 Type: Package
 Title: Joint Modelling of Multivariate Longitudinal Data and Time-to-Event
     Outcomes
-Version: 0.2.0.9000
+Version: 0.2.1
 Authors@R: c(
     person("Graeme L.", "Hickey", email = "[email protected]", 
         role = c("cre", "aut")),
@@ -19,7 +19,7 @@ Authors@R: c(
         comment = "data/renal.rda, R/hessian.R, R/vcov.R")
     )
 Maintainer: Graeme L. Hickey <[email protected]>
-Date: 2017-03-29
+Date: 2017-04-24
 Description: Fits the joint model proposed by Henderson and colleagues (2000) 
     <doi:10.1093/biostatistics/1.4.465>, but extended to the case of multiple 
     continuous longitudinal measures. The time-to-event data is modelled using a 

NAMESPACE

@@ -1,11 +1,5 @@
 # Generated by roxygen2: do not edit by hand
 
-
-if (getRversion() >= '3.3.0') {
-    importFrom(stats,sigma)
-} else {
-    importFrom(lme4,sigma)
-}
 S3method(confint,mjoint)
 S3method(fitted,mjoint)
 S3method(fixef,mjoint)
@@ -37,5 +31,6 @@ importFrom(graphics,plot)
 importFrom(lme4,ranef)
 importFrom(nlme,fixef)
 importFrom(nlme,getVarCov)
+importFrom(stats,sigma)
 importFrom(utils,stack)
 useDynLib(joineRML, .registration = TRUE)

NEWS.md

@@ -1,9 +1,11 @@
-# joineRML 0.2.0.9000 (devel version)
+# joineRML 0.2.1
 
 ## Bug patches
 
 * Fixed a bug that prevented factors with >2 levels being included in the time-to-event submodel.
 
+* Fixed package registration, which strangely broke on R 3.4.0 for OSX platform.
+
 ## Housekeeping
 
 * `joineRML` version 0.2.1 will depend on R version >=3.3.0 to remedy issue with `sigma.mjoint()` S3 issue.

R/sigma.mjoint.R

@@ -14,14 +14,9 @@
 #' Pinheiro JC, Bates DM. \emph{Mixed-Effects Models in S and S-PLUS.} New York:
 #' Springer Verlag; 2000.
 #'
-#' @return a number (standard deviation) if \eqn{K=1} (univariate model), or a
+#' @return a number (standard deviation) if \eqn{K = 1} (univariate model), or a
 #'   vector if \eqn{K>1} (multivariate model).
-#' @rawNamespace
-#' if (getRversion() >= '3.3.0') {
-#'     importFrom(stats,sigma)
-#' } else {
-#'     importFrom(lme4,sigma)
-#' }
+#' @importFrom stats sigma
 #' @export
 sigma.mjoint <- function(object, ...) {
 

cran-comments.md

@@ -1,8 +1,8 @@
 ## Test environments
-* local OS X install, R 3.3.3
-* ubuntu 12.04 (on travis-ci), R 3.3.2 (+ devel, oldrel)
-* windows (on appveyor)
-* win-builder (devel, release)
+* local OS X install, R 3.4.0
+* ubuntu (via travis-ci)
+* windows (via appveyor)
+* win-builder (release)
 * tested on several R-hub platforms
 
 ## R CMD check results