From f972c3a6d5fddb56d9d598598154f482198438c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20H=C3=A1va?= Date: Fri, 3 Aug 2018 12:31:42 +0200 Subject: [PATCH] [SW-975] Fix CRAN issues of Rsparkling (#874) --- r/build.gradle | 2 +- r/src/DESCRIPTION | 10 +++++++++- r/{ => src}/tests/testthat.R | 0 r/{ => src}/tests/testthat/test_transforms.R | 0 4 files changed, 10 insertions(+), 2 deletions(-) rename r/{ => src}/tests/testthat.R (100%) rename r/{ => src}/tests/testthat/test_transforms.R (100%) diff --git a/r/build.gradle b/r/build.gradle index 00344af719..8a088c9248 100644 --- a/r/build.gradle +++ b/r/build.gradle @@ -57,7 +57,7 @@ task test(type: Exec, dependsOn: [configurations.compile]) { environment['spark.ext.h2o.backend.cluster.mode'] = detectBackendClusterMode() environment["spark.ext.h2o.external.start.mode"] = detectExternalBackendStartMode() - workingDir file("tests") + workingDir file("src/tests") commandLine getOsSpecificCommandLine(['R', '-f', 'testthat.R']) } diff --git a/r/src/DESCRIPTION b/r/src/DESCRIPTION index e668806af6..d9d8c120fe 100644 --- a/r/src/DESCRIPTION +++ b/r/src/DESCRIPTION @@ -9,6 +9,14 @@ Authors@R: c( person("JJ", "Allaire", role = c("aut"), email = "jj@rstudio.com"), person("H2O.ai", role = c("cph")), person("RStudio", role = c("cph"))) +Author: Jakub Hava [aut, cre], + Navdeep Gill [aut], + Erin LeDell [aut], + Michal Malohlava [aut], + JJ Allaire [aut], + H2O.ai [cph], + RStudio [cph] +Maintainer: Jakub Hava Imports: utils, sparklyr (>= 0.3), @@ -21,7 +29,7 @@ Encoding: UTF-8 LazyData: true NeedsCompilation: no SystemRequirements: Java (>6) -URL: https://github.com/h2oai/rsparkling +URL: https://github.com/h2oai/sparkling-water/tree/master/r BugReports: http://jira.h2o.ai RoxygenNote: 5.0.1 Depends: diff --git a/r/tests/testthat.R b/r/src/tests/testthat.R similarity index 100% rename from r/tests/testthat.R rename to r/src/tests/testthat.R diff --git a/r/tests/testthat/test_transforms.R b/r/src/tests/testthat/test_transforms.R similarity index 100% rename from r/tests/testthat/test_transforms.R rename to r/src/tests/testthat/test_transforms.R