merged master

philippstats · Feb 17, 2016 · efdb4ef · efdb4ef
2 parents 8132a0c + f59b427
commit efdb4ef
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,16 @@ env:
   global:
   - secure: oBSw3lt+e3/iEEhYHXEAJpZWmITbC6HtqRVXIKQsVpaGfQ6zxxoIKeUOpSUGSGvG+CLBqie97a7eWDq2Z21md6wr+jBnmAoHlrUckQdw7GF8aT3aOmZzQ6cZbQniTn5nRJ8GlfYi/nkhxIDQ0bUY3KBBUak27uHvNEY4wqSdCxE=
   - secure: "UOXrFQRyK/l9AUBxpoEq3DkOaBGmml+gChxwla8Y9Z5xacCM46DhY2yob5BSqtD1EI+aKGe/1WwN/dqPeuJhwSSPFggP+RJ26Kyf8jWSxHPbZSOsULGVcfgtl/kgozlrj8alG26WUjcbA+c7GlvbSZXu3OWRZHW0aTnx9IIda+A="
+
 r_github_packages:
     - jimhester/covr
     - mlr-org/farff
 
+cache:
+  packages: true
+  directories:
+    - $HOME/.openml/cache
+
 after_success:
   - Rscript -e 'library(covr);coveralls()'
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -20,7 +20,8 @@ Suggests:
     rpart,
     RWeka,
     farff,
-    mboost
+    mboost,
+    xml2
 Imports:
     BBmisc (>= 1.9),
     checkmate (>= 1.6.3),

diff --git a/tests/testthat/helper_zzz.R b/tests/testthat/helper_zzz.R
@@ -7,9 +7,11 @@ library(checkmate)
 setOMLConfig(verbosity = 1L, cachedir = tempdir(), arff.reader = "farff")
 
 # if on travis, use our encrypted key, which is now in an OS envir var
+# furthermore, use a cached directory on travis
 if (identical(Sys.getenv("TRAVIS"), "true")) {
-  apikey = Sys.getenv("OPENMLAPIKEY")
-  setOMLConfig(apikey = apikey)
+  p = normalizePath("~/.openml/cache", mustWork = FALSE)
+  dir.create(p, recursive = TRUE, showWarnings = FALSE)
+  setOMLConfig(apikey = Sys.getenv("OPENMLAPIKEY"), cachedir = p)
 }
 
 configureMlr(on.learner.warning = "quiet", show.learner.output = FALSE)
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,8 @@ Suggests: @@
         rpart,
         RWeka,
         farff,
-        mboost
+        mboost,
+        xml2
     Imports:
         BBmisc (>= 1.9),
         checkmate (>= 1.6.3),
@@ Expand Down @@