@@ -33,7 +33,7 @@ Imports:

     methods,

     jsonlite,

     yaml,

-    basilisk.utils,

+    basilisk,

     reticulate

 Suggests: 

     knitr,

@@ -39,8 +39,8 @@ importFrom(Rcwl,runCWL)

 importFrom(S4Vectors,get_showHeadLines)

 importFrom(S4Vectors,get_showTailLines)

 importFrom(S4Vectors,mcols)

-importFrom(basilisk.utils,activateEnvironment)

-importFrom(basilisk.utils,deactivateEnvironment)

+importFrom(basilisk,basiliskStart)

+importFrom(basilisk,basiliskStop)

 importFrom(jsonlite,toJSON)

 importFrom(reticulate,py_install)

 importFrom(stats,setNames)

@@ -22,7 +22,7 @@

 #'     generated data files.

 #' @importFrom Rcwl runCWL

 #' @importFrom tools md5sum

-#' @importFrom basilisk.utils activateEnvironment deactivateEnvironment

+#' @importFrom basilisk basiliskStart basiliskStop

 #' @importFrom reticulate py_install

 #' @importFrom Rcwl env_Rcwl

 #' @export

@@ -80,8 +80,8 @@ getData <- function(rcp, outdir, prefix = NULL, notes = c(), conda = FALSE,

         cwlver <- system2("cwltool", "--version", stdout = TRUE)

         cwlver <- as.numeric(sub("\\.[0-9]*$", "", sub(".* ", "", cwlver)))

         if(cwlver < 3.1){

-            cl <- activateEnvironment(env_Rcwl)

-            on.exit(deactivateEnvironment(env_Rcwl))

+            cl <- basiliskStart(env_Rcwl)

+            on.exit(basiliskStop(cl))

             cwlver <- system2("cwltool", "--version", stdout = TRUE)

             cwlver <- as.numeric(sub("\\.[0-9]*$", "", sub(".* ", "", cwlver)))

             if(cwlver < 3.1){