[lilac] updated to 1.6.1-1

3 files changed, 30 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 317c838da782..35c2f586a1e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = r-hermes
 	pkgdesc = Preprocessing, analyzing, and reporting of RNA-seq data
-	pkgver = 1.6.0
+	pkgver = 1.6.1
 	pkgrel = 1
 	url = https://bioconductor.org/packages/hermes
 	arch = any
-	license = Apache
+	license = Apache-2.0
 	checkdepends = r-testthat
 	checkdepends = r-vdiffr
 	depends = r-assertthat
@@ -46,11 +46,11 @@ pkgbase = r-hermes
 	optdepends = r-testthat
 	optdepends = r-vdiffr
 	optdepends = r-withr
-	source = https://bioconductor.org/packages/release/bioc/src/contrib/hermes_1.6.0.tar.gz
+	source = https://bioconductor.org/packages/release/bioc/src/contrib/hermes_1.6.1.tar.gz
 	source = skip-tests.patch
-	md5sums = af1e1dd4bab597cfb7b0bd12a1e9e7dd
-	md5sums = 584674ff858d3b36bd221e71a3feabae
-	sha256sums = 7948b722f701e86f968a9e0a3f89a6a002c5bc22932912e50f86693ed17fc8d0
-	sha256sums = fdef7997f73aa7ddaa4d8307fde896adf051a2dc60d6d7f83871df252a10dd37
+	md5sums = 9e758f81455d5fc7a8b57c3a65b4de5b
+	md5sums = e228515b639417bea13853cfc94b866a
+	b2sums = 224fd9ad63e1bdf566a41e58f90c2cd120008add812f0ff4e777d72d9c3896c7d7ed06b5759b5c5330b2126dfc0cb6097584c7650c8a1f12fd2c1dcdf34ed99c
+	b2sums = b781820238d74265dce64de9804bd568587c61c0460e15b32eabf27e0f827d673e52e852274e2613a2cf55bd54e218ad21493d78fc16f8fe954a98d3b9970bb7
 
 pkgname = r-hermes
diff --git a/PKGBUILD b/PKGBUILD
index c0e55616242e..4d0462a4a869 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
 
 _pkgname=hermes
-_pkgver=1.6.0
+_pkgver=1.6.1
 pkgname=r-${_pkgname,,}
 pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc="Preprocessing, analyzing, and reporting of RNA-seq data"
 arch=(any)
-url="https://bioconductor.org/packages/${_pkgname}"
-license=(Apache)
+url="https://bioconductor.org/packages/$_pkgname"
+license=('Apache-2.0')
 depends=(
   r-assertthat
   r-biobase
@@ -58,10 +58,10 @@ optdepends=(
 )
 source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
         "skip-tests.patch")
-md5sums=('af1e1dd4bab597cfb7b0bd12a1e9e7dd'
-         '584674ff858d3b36bd221e71a3feabae')
-sha256sums=('7948b722f701e86f968a9e0a3f89a6a002c5bc22932912e50f86693ed17fc8d0'
-            'fdef7997f73aa7ddaa4d8307fde896adf051a2dc60d6d7f83871df252a10dd37')
+md5sums=('9e758f81455d5fc7a8b57c3a65b4de5b'
+         'e228515b639417bea13853cfc94b866a')
+b2sums=('224fd9ad63e1bdf566a41e58f90c2cd120008add812f0ff4e777d72d9c3896c7d7ed06b5759b5c5330b2126dfc0cb6097584c7650c8a1f12fd2c1dcdf34ed99c'
+        'b781820238d74265dce64de9804bd568587c61c0460e15b32eabf27e0f827d673e52e852274e2613a2cf55bd54e218ad21493d78fc16f8fe954a98d3b9970bb7')
 
 prepare() {
   # skip failing tests
@@ -69,8 +69,8 @@ prepare() {
 }
 
 build() {
-  mkdir -p build
-  R CMD INSTALL "$_pkgname" -l build
+  mkdir build
+  R CMD INSTALL -l build "$_pkgname"
 }
 
 check() {
diff --git a/skip-tests.patch b/skip-tests.patch
index c3937930c808..0d5fdbae7849 100644
--- a/skip-tests.patch
+++ b/skip-tests.patch
@@ -19,7 +19,7 @@ index f7c5f29..0010620 100644
    result <- autoplot(
      object,
 diff --git a/hermes/tests/testthat/test-connections.R b/hermes/tests/testthat/test-connections.R
-index 7a471fa..2fbc695 100644
+index 7a471fa..088f659 100644
 --- a/hermes/tests/testthat/test-connections.R
 +++ b/hermes/tests/testthat/test-connections.R
 @@ -2,7 +2,7 @@
@@ -31,7 +31,15 @@ index 7a471fa..2fbc695 100644
    NULL
  } else {
    as(
-@@ -30,6 +30,7 @@ test_that("connect_biomart works as expected", {
+@@ -17,6 +17,7 @@ httr::set_config(httr::config(ssl_verifypeer = FALSE))
+ # connect_biomart ----
+ 
+ test_that("connect_biomart works as expected", {
++  skip("fails")
+   skip_on_ci()
+   skip_on_bioc()
+ 
+@@ -30,6 +31,7 @@ test_that("connect_biomart works as expected", {
  })
  
  test_that("connect_biomart can specify older version of Ensembl", {
@@ -39,7 +47,7 @@ index 7a471fa..2fbc695 100644
    skip_on_ci()
    skip_on_bioc()
  
-@@ -45,6 +46,7 @@ test_that("connect_biomart can specify older version of Ensembl", {
+@@ -45,6 +47,7 @@ test_that("connect_biomart can specify older version of Ensembl", {
  # h_get_annotation_biomart ----
  
  test_that("h_get_annotation_biomart works as expected", {
@@ -47,7 +55,7 @@ index 7a471fa..2fbc695 100644
    skip_on_ci()
    skip_on_bioc()
  
-@@ -86,6 +88,7 @@ test_that("h_strip_prefix works as expected", {
+@@ -86,6 +89,7 @@ test_that("h_strip_prefix works as expected", {
  # h_get_size_biomart ----
  
  test_that("h_get_size_biomart works as expected", {
@@ -55,7 +63,7 @@ index 7a471fa..2fbc695 100644
    skip_on_ci()
    skip_on_bioc()
  
-@@ -126,6 +129,7 @@ test_that("h_get_size_biomart works as expected", {
+@@ -126,6 +130,7 @@ test_that("h_get_size_biomart works as expected", {
  # h_ensembl_to_entrez_ids ----
  
  test_that("h_ensembl_to_entrez_ids works as expected", {
@@ -63,7 +71,7 @@ index 7a471fa..2fbc695 100644
    skip_on_ci()
    skip_on_bioc()
  
-@@ -163,6 +167,7 @@ test_that("h_get_granges_by_id works as expected", {
+@@ -163,6 +168,7 @@ test_that("h_get_granges_by_id works as expected", {
  # query-ConnectionBiomart ----
  
  test_that("query to Biomart works as expected", {