upgpkg: r-desc 1.4.2-3

2 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5004cc35bfd8..cab8f3a7e9c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,10 @@
 pkgbase = r-desc
 	pkgdesc = Manipulate DESCRIPTION Files
 	pkgver = 1.4.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://cran.r-project.org/package=desc
 	arch = any
 	license = MIT
-	checkdepends = r-callr
-	checkdepends = r-covr
-	checkdepends = r-gh
-	checkdepends = r-spelling
-	checkdepends = r-whoami
-	checkdepends = r-withr
-	checkdepends = r-testthat
 	depends = r>=3.4.0
 	depends = r-cli
 	depends = r-r6
diff --git a/PKGBUILD b/PKGBUILD
index c49972434c1d..8cbbac45fd1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="Manipulate DESCRIPTION Files"
 url="https://cran.r-project.org/package=${_cranname}"
 license=("MIT")
 pkgver=${_cranver//[:-]/.}
-pkgrel=2
+pkgrel=3
 
 arch=("any")
 depends=(
@@ -26,10 +26,25 @@ optdepends=(
     "r-whoami"
     "r-withr"
 )
-checkdepends=(
-    "${optdepends[@]}"
-    "r-testthat"
-)
+
+# The unittests for `r-desc` have multiple circular
+# dependency chains.
+
+# As such, the tests can not be run on first build.
+# While R packages from CRAN, generally, are well-tested
+# before they are released, in some situations, you want to
+# have thorough testing on your own end.
+
+# To run the tests, first build this package without `check()`
+# (i.e., as-is) to bootstrap `r-desc`. Then, on subsequent builds,
+# (assumining you have a local repository that is accessible from
+# the build chroot), uncomment the lines defining `checkdepends`, below,
+# as well as the `check()` function further down
+
+# checkdepends=(
+#     "${optdepends[@]}"
+#     "r-testthat"
+# )
 
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 b2sums=("35d1f2f80c2bd9b59c8e7589fe573d90816cebd1fd763a232243a074dfd2ec052dce1424988e931a429c3898845a44bbbc6628405a93b4693a4dabaf5fdc59f3")
@@ -39,15 +54,14 @@ build() {
     R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}/build/"
 }
 
-check() {
-    cd "${srcdir}/${_cranname}/tests"
-    R_LIBS="${srcdir}/build/" Rscript --vanilla testthat.R
-}
+# check() {
+#     export R_LIBS="build/"
+#     R CMD check --no-manual "${_cranname}"
+# }
 
 package() {
     install -dm0755 "${pkgdir}/usr/lib/R/library"
     cp -a --no-preserve=ownership "${srcdir}/build/${_cranname}" "${pkgdir}/usr/lib/R/library"
-
     if [[ -f "${_cranname}/LICENSE" ]]; then
         install -Dm0644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
     fi