You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sedona.apache.org by ji...@apache.org on 2023/03/04 09:09:23 UTC
[sedona] branch master updated: [SEDONA-250][SEDONA-253] R - Update dependencies + drop 2.4 (#783)
This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sedona.git
The following commit(s) were added to refs/heads/master by this push:
new 697306ed [SEDONA-250][SEDONA-253] R - Update dependencies + drop 2.4 (#783)
697306ed is described below
commit 697306edab3e215c6d932ecbac6113609c95032a
Author: gregleleu <33...@users.noreply.github.com>
AuthorDate: Sat Mar 4 04:09:18 2023 -0500
[SEDONA-250][SEDONA-253] R - Update dependencies + drop 2.4 (#783)
---
.../scripts/prepare_sparklyr_sedona_test_env.sh | 20 ++------------------
R/R/dependencies.R | 9 ++-------
R/apache.sedona.Rproj | 1 +
R/tests/testthat/helper-initialize.R | 5 +++++
4 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/scripts/prepare_sparklyr_sedona_test_env.sh b/.github/workflows/scripts/prepare_sparklyr_sedona_test_env.sh
index dc72029c..9907c0c8 100644
--- a/.github/workflows/scripts/prepare_sparklyr_sedona_test_env.sh
+++ b/.github/workflows/scripts/prepare_sparklyr_sedona_test_env.sh
@@ -19,24 +19,8 @@
sedona_jar_files () {
local subdir
- for subdir in 'common' 'core' 'sql' 'viz'; do
- local artifact_id="$(
- mvn \
- org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
- -Dexpression=project.artifactId \
- -q \
- -DforceStdout \
- -f "${subdir}"/target/resolved-pom.xml
- )"
- local artifact_version="$(
- mvn \
- org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
- -Dexpression=project.version \
- -q \
- -DforceStdout \
- -f "${subdir}"/target/resolved-pom.xml
- )"
- echo "$(pwd)/${subdir}/target/${artifact_id}-${artifact_version}.jar"
+ for subdir in 'spark-shaded' 'viz'; do
+ echo "$(pwd)/$(find ${subdir}/target -name 'sedona-*.jar' \! -name '*javadoc*')"
done
}
diff --git a/R/R/dependencies.R b/R/R/dependencies.R
index 216e6739..7916cd78 100644
--- a/R/R/dependencies.R
+++ b/R/R/dependencies.R
@@ -20,18 +20,13 @@ spark_dependencies <- function(spark_version, scala_version, ...) {
if (spark_version[1, 1] == "3") {
spark_version <- "3.0"
scala_version <- scala_version %||% "2.12"
- } else if (spark_version[1, 1] == "2" && spark_version[1, 2] == "4") {
- spark_version <- "2.4"
- scala_version <- scala_version %||% "2.11"
} else {
stop("Unsupported Spark version: ", spark_version)
}
packages <- c(
- "org.datasyslab:geotools-wrapper:1.3.0-27.2",
- "edu.ucar:cdm-core:5.4.2",
- "org.locationtech.jts:jts-core:1.19.0",
- "org.wololo:jts2geojson:0.16.1"
+ "org.datasyslab:geotools-wrapper:1.4.0-28.2",
+ "edu.ucar:cdm-core:5.4.2"
)
jars <- NULL
diff --git a/R/apache.sedona.Rproj b/R/apache.sedona.Rproj
index 21a4da08..eaa6b818 100644
--- a/R/apache.sedona.Rproj
+++ b/R/apache.sedona.Rproj
@@ -15,3 +15,4 @@ LaTeX: pdfLaTeX
BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
+PackageRoxygenize: rd,collate,namespace
diff --git a/R/tests/testthat/helper-initialize.R b/R/tests/testthat/helper-initialize.R
index d18d1b17..439a20d6 100644
--- a/R/tests/testthat/helper-initialize.R
+++ b/R/tests/testthat/helper-initialize.R
@@ -28,9 +28,14 @@ testthat_spark_connection <- function(conn_retry_interval_s = 2) {
for (attempt in seq(conn_attempts)) {
success <- tryCatch(
{
+
+ config <- spark_config()
+ config[["sparklyr.connect.timeout"]] <- 300
+
sc <- spark_connect(
master = "local",
method = "shell",
+ config = config,
app_name = paste0("testthat-", uuid::UUIDgenerate()),
version = version
)