Update to 3.7.1 and remove check() to avoid dependency cycle with r-testthat

3 files changed, 38 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2521f1d806b3..8a998d2a0942 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,23 @@
 pkgbase = r-callr
 	pkgdesc = Call R from R
-	pkgver = 3.7.0
-	pkgrel = 2
+	pkgver = 3.7.1
+	pkgrel = 1
 	url = https://cran.r-project.org/package=callr
 	arch = any
 	license = MIT
-	checkdepends = r-testthat
-	depends = r
-	depends = r-processx>=3.5.0
+	depends = r-processx
 	depends = r-r6
 	optdepends = r-cli
 	optdepends = r-covr
+	optdepends = r-mockery
 	optdepends = r-ps
 	optdepends = r-rprojroot
 	optdepends = r-spelling
 	optdepends = r-testthat
-	optdepends = r-withr>=2.3.0
-	source = https://cran.r-project.org/src/contrib/callr_3.7.0.tar.gz
-	source = CRAN_MIT::https://cran.r-project.org/web/licenses/MIT
-	sha256sums = d67255148595c6d0ba4c4d241bc9f6b5e00cafe25fdc13e38c10acc38653360a
+	optdepends = r-withr
+	source = https://cran.r-project.org/src/contrib/callr_3.7.1.tar.gz
+	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	sha256sums = 37e3a57b3a5b3050fe55439394a9191c938f461b38174ecbaadc86539a4189ed
 	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-callr
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index c0a725ed87de..4860fc842e2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,43 @@
-# Maintainer: Robert Greener <me@r0bert.dev>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Robert Greener <me@r0bert.dev>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Contributor: Alex Branham <branham@utexas.edu>
+
 _cranname=callr
-_cranver=3.7.0
+_cranver=3.7.1
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
-pkgrel=2
+pkgrel=1
 pkgdesc="Call R from R"
 arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
 license=(MIT)
-depends=(
-	r
-	"r-processx>=3.5.0"
-	r-r6
-)
-checkdepends=(
-	r-testthat
-)
+depends=(r-processx r-r6)
 optdepends=(
-	r-cli
-	r-covr
-	r-ps
-	r-rprojroot
-	r-spelling
-	r-testthat
-	"r-withr>=2.3.0"
+    r-cli
+    r-covr
+    r-mockery
+    r-ps
+    r-rprojroot
+    r-spelling
+    r-testthat
+    r-withr
 )
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-	"CRAN_MIT::https://cran.r-project.org/web/licenses/MIT")
+        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
+sha256sums=('37e3a57b3a5b3050fe55439394a9191c938f461b38174ecbaadc86539a4189ed'
+            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
 
 build() {
-	mkdir -p build
-	R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
-}
-
-check() {
-	if [ -d "${_cranname}/tests" ]
-	then
-  		cd "${_cranname}/tests"
-		for i in *.R; do
-			R_LIBS="${srcdir}/build" Rscript --vanilla $i
-		done
-	fi
+  mkdir -p build
+  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
 }
 
 package() {
-	install -dm0755 "${pkgdir}/usr/lib/R/library"
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
 
-	cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
-	install -Dm644 CRAN_MIT "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
-	install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
+  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 
-sha256sums=('d67255148595c6d0ba4c4d241bc9f6b5e00cafe25fdc13e38c10acc38653360a'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
+  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}