You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2023/05/08 12:06:54 UTC
[arrow-adbc] branch main updated: chore(r): Clean up R verification tasks + ensure all drivers are verified (#659)
This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new d8dcdcf chore(r): Clean up R verification tasks + ensure all drivers are verified (#659)
d8dcdcf is described below
commit d8dcdcfb58ac7997f185142cefd8d85ca44d52a3
Author: Dewey Dunnington <de...@voltrondata.com>
AuthorDate: Mon May 8 08:06:49 2023 -0400
chore(r): Clean up R verification tasks + ensure all drivers are verified (#659)
Ok! I checked the logs to make sure that all the drivers are actually
running and passing CMD check. Again, I'm punting on Windows. As part of
verification I run the bash verification script on Git bash on Windows
which works for the R portion...obviously it's better if it's in the
Powershell version but I don't have the bandwidth to make that happen
before 0.4.
---
dev/release/utils-prepare.sh | 8 ++++++++
dev/release/verify-release-candidate.sh | 8 ++++++++
r/adbcdrivermanager/DESCRIPTION | 2 +-
r/adbcpostgresql/DESCRIPTION | 2 +-
r/adbcsnowflake/DESCRIPTION | 2 +-
r/adbcsqlite/DESCRIPTION | 2 +-
6 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index ec8a466..cc6dcde 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -27,11 +27,13 @@ update_versions() {
local version=${base_version}
local conda_version=${base_version}
local docs_version=${base_version}
+ local r_version=${base_version}
;;
snapshot)
local version=${next_version}-SNAPSHOT
local conda_version=${next_version}
local docs_version="${next_version} (dev)"
+ local r_version="${base_version}.9000"
;;
esac
local major_version=${version%%.*}
@@ -68,6 +70,12 @@ update_versions() {
rm "${ADBC_DIR}/ruby/lib/adbc/version.rb.bak"
git add "${ADBC_DIR}/ruby/lib/adbc/version.rb"
+ for desc_file in $(find "${ADBC_DIR}/r" -name DESCRIPTION); do
+ sed -i.bak -E "s/Version:.*$/Version: ${r_version}/" "${desc_file}"
+ rm "${desc_file}.bak"
+ git add "${desc_file}"
+ done
+
if [ ${type} = "release" ]; then
pushd "${ADBC_DIR}/ci/linux-packages"
rake version:update VERSION=${version}
diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
index 0455d1e..73e3c96 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -482,15 +482,23 @@ test_r() {
R_LIBS_USER="${ARROW_TMPDIR}/r/tmplib" R -e 'if (!requireNamespace("testthat", quietly = TRUE)) install.packages("testthat", repos = "https://cloud.r-project.org/")' --vanilla
R CMD INSTALL "${ADBC_SOURCE_DIR}/r/adbcdrivermanager" --preclean --library="${ARROW_TMPDIR}/r/tmplib"
R CMD INSTALL "${ADBC_SOURCE_DIR}/r/adbcsqlite" --preclean --library="${ARROW_TMPDIR}/r/tmplib"
+ R CMD INSTALL "${ADBC_SOURCE_DIR}/r/adbcpostgresql" --preclean --library="${ARROW_TMPDIR}/r/tmplib"
+ R CMD INSTALL "${ADBC_SOURCE_DIR}/r/adbcsnowflake" --preclean --library="${ARROW_TMPDIR}/r/tmplib"
pushd "${ARROW_TMPDIR}/r"
R CMD build "${ADBC_SOURCE_DIR}/r/adbcdrivermanager"
R CMD build "${ADBC_SOURCE_DIR}/r/adbcsqlite"
+ R CMD build "${ADBC_SOURCE_DIR}/r/adbcpostgresql"
+ R CMD build "${ADBC_SOURCE_DIR}/r/adbcsnowflake"
local -r adbcdrivermanager_tar_gz="$(ls adbcdrivermanager_*.tar.gz)"
local -r adbcsqlite_tar_gz="$(ls adbcsqlite_*.tar.gz)"
+ local -r adbcpostgresql_tar_gz="$(ls adbcpostgresql_*.tar.gz)"
+ local -r adbcsnowflake_tar_gz="$(ls adbcsnowflake_*.tar.gz)"
R_LIBS_USER="${ARROW_TMPDIR}/r/tmplib" R CMD check "${adbcdrivermanager_tar_gz}" --no-manual
R_LIBS_USER="${ARROW_TMPDIR}/r/tmplib" R CMD check "${adbcsqlite_tar_gz}" --no-manual
+ R_LIBS_USER="${ARROW_TMPDIR}/r/tmplib" R CMD check "${adbcpostgresql_tar_gz}" --no-manual
+ R_LIBS_USER="${ARROW_TMPDIR}/r/tmplib" R CMD check "${adbcsnowflake_tar_gz}" --no-manual
popd
}
diff --git a/r/adbcdrivermanager/DESCRIPTION b/r/adbcdrivermanager/DESCRIPTION
index 06ecc02..e646a05 100644
--- a/r/adbcdrivermanager/DESCRIPTION
+++ b/r/adbcdrivermanager/DESCRIPTION
@@ -1,6 +1,6 @@
Package: adbcdrivermanager
Title: Arrow Database Connectivity (ADBC) Driver Manager
-Version: 0.0.0.9000
+Version: 0.3.0.9000
Authors@R: c(
person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-9415-4582")),
diff --git a/r/adbcpostgresql/DESCRIPTION b/r/adbcpostgresql/DESCRIPTION
index 2a793f3..3210af5 100644
--- a/r/adbcpostgresql/DESCRIPTION
+++ b/r/adbcpostgresql/DESCRIPTION
@@ -1,6 +1,6 @@
Package: adbcpostgresql
Title: Arrow Database Connectivity (ADBC) PostgreSQL Driver
-Version: 0.0.0.9000
+Version: 0.3.0.9000
Authors@R: c(
person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-9415-4582")),
diff --git a/r/adbcsnowflake/DESCRIPTION b/r/adbcsnowflake/DESCRIPTION
index da4f090..1ba15a3 100644
--- a/r/adbcsnowflake/DESCRIPTION
+++ b/r/adbcsnowflake/DESCRIPTION
@@ -1,6 +1,6 @@
Package: adbcsnowflake
Title: Arrow Database Connectivity (ADBC) Snowflake Driver
-Version: 0.0.0.9000
+Version: 0.3.0.9000
Authors@R: c(
person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-9415-4582")),
diff --git a/r/adbcsqlite/DESCRIPTION b/r/adbcsqlite/DESCRIPTION
index b555045..f9e8687 100644
--- a/r/adbcsqlite/DESCRIPTION
+++ b/r/adbcsqlite/DESCRIPTION
@@ -1,6 +1,6 @@
Package: adbcsqlite
Title: Arrow Database Connectivity (ADBC) SQLite Driver
-Version: 0.0.0.9000
+Version: 0.3.0.9000
Authors@R: c(
person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-9415-4582")),