Update to 0.2.6

2 files changed, 113 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b72a5d99412f..89a08a013855 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,58 @@
 pkgbase = r-dimred
 	pkgdesc = A Framework for Dimensionality Reduction
-	pkgver = 0.1.0
+	pkgver = 0.2.6
 	pkgrel = 1
 	url = https://cran.r-project.org/package=dimRed
-	arch = x86_64
+	arch = any
 	license = GPL3
-	license = custom
-	depends = r
+	checkdepends = python-tensorflow
+	checkdepends = r-coranking
+	checkdepends = r-diffusionmap
+	checkdepends = r-fastica
+	checkdepends = r-igraph
+	checkdepends = r-keras
+	checkdepends = r-nmf
+	checkdepends = r-pcal1
+	checkdepends = r-rann
+	checkdepends = r-reticulate
+	checkdepends = r-rspectra
+	checkdepends = r-rtsne
+	checkdepends = r-tensorflow
+	checkdepends = r-testthat
+	checkdepends = r-umap
+	checkdepends = r-vegan
 	depends = r-drr
-	optdepends = r-rann
-	optdepends = r-rspectra
-	optdepends = r-rtsne
+	depends = r-magrittr
+	optdepends = r-cccd
 	optdepends = r-coranking
 	optdepends = r-diffusionmap
 	optdepends = r-energy
 	optdepends = r-fastica
 	optdepends = r-ggplot2
 	optdepends = r-igraph
+	optdepends = r-keras
 	optdepends = r-kernlab
-	optdepends = r-lle
+	optdepends = r-knitr
 	optdepends = r-loe
+	optdepends = r-nmf
 	optdepends = r-optimx
+	optdepends = r-pcal1
 	optdepends = r-pcapp
+	optdepends = r-rann
+	optdepends = r-reticulate
 	optdepends = r-rgl
+	optdepends = r-rspectra
+	optdepends = r-rtsne
 	optdepends = r-scales
 	optdepends = r-scatterplot3d
+	optdepends = r-tensorflow
 	optdepends = r-testthat
 	optdepends = r-tidyr
+	optdepends = r-tinytex
+	optdepends = r-umap
 	optdepends = r-vegan
-	source = https://cran.r-project.org/src/contrib/dimRed_0.1.0.tar.gz
-	md5sums = 0f8818edd6a9b663ddf5d1e6a28dd8bc
+	source = https://cran.r-project.org/src/contrib/dimRed_0.2.6.tar.gz
+	md5sums = 1cef3b06c7f0eea422fedbbf04a28e63
+	sha256sums = 9a7eb14781f01a12e26e7b26a91c8edaca7d824b9c1ffe74c81837098d9bf417
 
 pkgname = r-dimred
-
diff --git a/PKGBUILD b/PKGBUILD
index 2172e4ec68bf..9b3fd1aac7a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,87 @@
-# Maintainer: Alex Branham <branham@utexas.edu>
-_cranname=dimRed
-_cranver=0.1.0
-_pkgtar=${_cranname}_${_cranver}.tar.gz
-pkgname=r-dimred
-pkgver=${_cranver//[:-]/.}
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Alex Branham <branham@utexas.edu>
+
+_pkgname=dimRed
+_pkgver=0.2.6
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc="A Framework for Dimensionality Reduction"
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_cranname}"
-license=('GPL3' 'custom')
-depends=('r' 'r-drr')
+arch=(any)
+url="https://cran.r-project.org/package=${_pkgname}"
+license=(GPL3)
+depends=(
+  r-drr
+  r-magrittr
+)
+checkdepends=(
+  python-tensorflow
+  r-coranking
+  r-diffusionmap
+  r-fastica
+  r-igraph
+  r-keras
+  r-nmf
+  r-pcal1
+  r-rann
+  r-reticulate
+  r-rspectra
+  r-rtsne
+  r-tensorflow
+  r-testthat
+  r-umap
+  r-vegan
+)
+optdepends=(
+  r-cccd
+  r-coranking
+  r-diffusionmap
+  r-energy
+  r-fastica
+  r-ggplot2
+  r-igraph
+  r-keras
+  r-kernlab
+  r-knitr
+  r-loe
+  r-nmf
+  r-optimx
+  r-pcal1
+  r-pcapp
+  r-rann
+  r-reticulate
+  r-rgl
+  r-rspectra
+  r-rtsne
+  r-scales
+  r-scatterplot3d
+  r-tensorflow
+  r-testthat
+  r-tidyr
+  r-tinytex
+  r-umap
+  r-vegan
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('1cef3b06c7f0eea422fedbbf04a28e63')
+sha256sums=('9a7eb14781f01a12e26e7b26a91c8edaca7d824b9c1ffe74c81837098d9bf417')
 
-optdepends=('r-rann' 'r-rspectra' 'r-rtsne' 'r-coranking' 'r-diffusionmap' 'r-energy' 'r-fastica' 'r-ggplot2' 'r-igraph' 'r-kernlab' 'r-lle' 'r-loe' 'r-optimx' 'r-pcapp' 'r-rgl' 'r-scales' 'r-scatterplot3d' 'r-testthat' 'r-tidyr' 'r-vegan')
+prepare() {
+  # fix import in test
+  sed -i 's/requireNamespace("FastICA"/requireNamespace("fastICA"/' "$_pkgname/tests/testthat/test_fastICA.R"
+}
 
-source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
-md5sums=('0f8818edd6a9b663ddf5d1e6a28dd8bc')
+build() {
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
 
-build(){
-    R CMD INSTALL ${_pkgtar} -l $srcdir
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
+
 package() {
-    install -d "$pkgdir/usr/lib/R/library"
-    cp -r "$srcdir/$_cranname" "$pkgdir/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 }
-