From 254f01b51efc25c0176f1b8225eb6b3d8eef4887 Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Tue, 12 Sep 2023 16:58:04 +0300 Subject: [PATCH] r-stars: use metadata checks --- BioArchLinux/r-stars/PKGBUILD | 38 ++++++++++++++++++++++--------- BioArchLinux/r-stars/lilac.py | 11 +++++---- BioArchLinux/r-stars/lilac.yaml | 18 +++++++++++---- lilac-extensions/lilac_r_utils.py | 1 + 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/BioArchLinux/r-stars/PKGBUILD b/BioArchLinux/r-stars/PKGBUILD index edc3846089..10514b1d6c 100644 --- a/BioArchLinux/r-stars/PKGBUILD +++ b/BioArchLinux/r-stars/PKGBUILD @@ -1,27 +1,34 @@ -# Maintainer: sukanka +# Maintainer: Pekka Ristola +# Contributor: sukanka _pkgname=stars _pkgver=0.6-4 pkgname=r-${_pkgname,,} -pkgver=0.6.4 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Spatiotemporal Arrays, Raster and Vector Data Cubes' -arch=('any') +pkgdesc="Spatiotemporal Arrays, Raster and Vector Data Cubes" +arch=(any) url="https://cran.r-project.org/package=${_pkgname}" -license=('Apache') +license=(Apache) depends=( - r r-abind r-classint - r-lwgeom r-rlang r-sf r-units ) +checkdepends=( + r-cubble + r-dplyr + r-ncmeta + r-raster + r-testthat +) optdepends=( r-cairo r-clue r-covr + r-cubble r-cubelyr r-digest r-dplyr @@ -35,6 +42,7 @@ optdepends=( r-httr r-jsonlite r-knitr + r-lwgeom r-mapdata r-maps r-ncdfgeom @@ -54,20 +62,28 @@ optdepends=( r-starsdata r-terra r-testthat + r-tibble r-tidyr + r-tsibble r-viridis r-xts r-zoo ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('396cf91eb8e8d9c10ffeddd0cb85e1da') sha256sums=('424a4cfde4c3524f8bd44a1090c8d725662af8cc636f785d951d4aa45c130d57') build() { - R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}" + mkdir -p build + R CMD INSTALL "$_pkgname" -l build +} + +check() { + cd "$_pkgname/tests" + R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R } package() { - install -dm0755 "${pkgdir}/usr/lib/R/library" - cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library" + install -d "$pkgdir/usr/lib/R/library" + cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" } -# vim:set ts=2 sw=2 et: diff --git a/BioArchLinux/r-stars/lilac.py b/BioArchLinux/r-stars/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-stars/lilac.py +++ b/BioArchLinux/r-stars/lilac.py @@ -1,12 +1,13 @@ #!/usr/bin/env python3 from lilaclib import * +import os +import sys +sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) +from lilac_r_utils import r_pre_build + def pre_build(): - for line in edit_file('PKGBUILD'): - if line.startswith('_pkgver='): - line = f'_pkgver={_G.newver}' - print(line) - update_pkgver_and_pkgrel(_G.newver.replace(':', '.').replace('-', '.')) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-stars/lilac.yaml b/BioArchLinux/r-stars/lilac.yaml index c690746f46..8e3ccb2c00 100644 --- a/BioArchLinux/r-stars/lilac.yaml +++ b/BioArchLinux/r-stars/lilac.yaml @@ -1,14 +1,22 @@ build_prefix: extra-x86_64 maintainers: -- github: sukanka +- github: pekkarr + email: pekkarr@protonmail.com repo_depends: - r-abind - r-classint -- r-lwgeom - r-rlang - r-sf - r-units +repo_makedepends: +- r-cubble +- r-dplyr +- r-ncmeta +- r-raster +- r-testthat update_on: -- regex: stars_([\d._-]+).tar.gz - source: regex - url: https://cran.r-project.org/package=stars +- source: rpkgs + pkgname: stars + repo: cran + md5: true +- alias: r diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index 7ea98d3175..e1c02c9f98 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -185,6 +185,7 @@ class Pkgbuild: # maps the license field in the DESCRIPTION file to a PKGBUILD license value license_map = { + "Apache License": "Apache", "Apache License (== 2.0)": "Apache", "Apache License 2.0": "Apache", "Artistic-2.0": "Artistic2.0",