Skip to content

Commit

Permalink
Update r-archr to 1.0.3 (#52121)
Browse files Browse the repository at this point in the history
* Update r-archr to 1.0.3

* update deps; update license; drop patch

* drop patch

* Update deps

* run testthat tests

* add test dep

* debug

* debug

* reenable tests; add deps

* upper bound ggplot2

* install tests

* test installed tests

* avoid container unit tests

this depends that `test.requires` are not installed for the container and checks lack of macs2 to skip

* conditional

---------

Co-authored-by: Mervin Fansler <[email protected]>
Co-authored-by: Mervin Fansler <[email protected]>
  • Loading branch information
3 people authored Nov 20, 2024
1 parent 7eea271 commit 7f7efbe
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 49 deletions.
2 changes: 1 addition & 1 deletion recipes/r-archr/build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export DISABLE_AUTOBREW=1
${R} CMD INSTALL --build . ${R_ARGS}
${R} CMD INSTALL --build --install-tests . ${R_ARGS}
45 changes: 33 additions & 12 deletions recipes/r-archr/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = '1.0.2' %}
{% set version = '1.0.3' %}
{% set github = 'https://github.com/GreenleafLab/ArchR' %}
{% set posix = 'm2-' if win else '' %}

Expand All @@ -8,9 +8,7 @@ package:

source:
url: {{ github }}/archive/refs/tags/v{{ version }}.tar.gz
sha256: afe4d82975e9d75018e9ec9fda3d116f34f99ad1d45990cbc5a2be7dea8df352
patches:
- patches/0001-cap-threads.patch
sha256: 9c07c785a095062a998ed94c65df17a58f273d0d64062c14210f0a2c491304cf

build:
number: 0
Expand All @@ -26,7 +24,7 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
host:
- r-base =4.1
- r-base
- bioconductor-biocgenerics
- bioconductor-biostrings
- bioconductor-chromvar
Expand All @@ -36,23 +34,31 @@ requirements:
- bioconductor-rhdf5
- bioconductor-rsamtools
- bioconductor-s4vectors >=0.9.25
- bioconductor-sparsematrixstats
- bioconductor-summarizedexperiment
- r-chromvarmotifs
- r-data.table
- r-ggplot2
- r-devtools
- r-ggplot2 <3.5
- r-ggrepel
- r-gridextra
- r-gtable
- r-gtools
- r-harmony
- r-magrittr
- r-matrix
- r-matrixstats
- r-nabor
- r-plyr
- r-presto
- r-rcpp >=0.12.16
- r-rcpparmadillo
- r-seurat
- r-seuratobject
- r-stringr
- r-uwot
run:
- r-base =4.1
- r-base
- bioconductor-biocgenerics
- bioconductor-biostrings
- bioconductor-chromvar
Expand All @@ -62,36 +68,51 @@ requirements:
- bioconductor-rhdf5
- bioconductor-rsamtools
- bioconductor-s4vectors >=0.9.25
- bioconductor-sparsematrixstats
- bioconductor-summarizedexperiment
- r-chromvarmotifs
- r-data.table
- r-ggplot2
- r-devtools
- r-ggplot2 <3.5
## ggrastr is optional lib, but plotting defaults assume it
- r-ggrastr
- r-ggrepel
- r-gridextra
- r-gtable
- r-gtools
- r-harmony
- r-magrittr
- r-matrix
- r-matrixstats
- r-nabor
- r-plyr
- r-presto
- r-rcpp >=0.12.16
- r-rcpparmadillo
- r-seurat
- r-seuratobject
- r-stringr
- r-uwot

test:
requires:
- r-testthat
- macs2
- bioconductor-bsgenome.hsapiens.ucsc.hg19
commands:
- $R -e "library('ArchR')"
## NB: this tightly-couples to `macs2` coming from `test.requires` and avoids running against the container
- if command -v macs2; then $R -e "testthat::test_package('ArchR', stop_on_failure=TRUE)"; fi

about:
home: https://www.archrproject.com
dev_url: {{ github }}
doc_url: https://www.archrproject.com/bookdown/index.html
license: GPL-2.0-or-later
license: MIT
summary: This package is designed to streamline scATAC analyses in R.
license_family: GPL2
license_family: MIT
license_file:
- {{ environ['PREFIX'] }}/lib/R/share/licenses/GPL-2
- {{ environ['PREFIX'] }}/lib/R/share/licenses/GPL-3
- {{ environ['PREFIX'] }}/lib/R/share/licenses/MIT

extra:
recipe-maintainers:
Expand Down
36 changes: 0 additions & 36 deletions recipes/r-archr/patches/0001-cap-threads.patch

This file was deleted.

0 comments on commit 7f7efbe

Please sign in to comment.