Merge pull request #299 from mvfki/newObj

Collective updates

.Rbuildignore

@@ -1,17 +1,23 @@
+LICENSE
+^\.lintr$
+^\.vscode
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.travis\.yml$
+^\.covrignore$
 ^travis_setup\.sh$
 ^_config\.yml$
 ^_pkgdown\.yml$
+^codecov\.yml$
 ^appveyor\.yml$
 \.png$
-^vignettes/walkthrough_pbmc\.Rmd$
-^docs$
-^vignettes/Integrating_scRNA_and_scATAC_data\.Rmd$
-^vignettes/Integrating_multi_scRNA_data\.Rmd$
 ^.vscode/*
-^vignettes/*
-\.rds$
-\.RDS$
 ^\.lintr$
+^\.github/*
+^pkgdown/*
+^/cmake*
+^vignettes/articles/*
+^docs
+^devdata
+^tests/testthat/*\.h5$
+^vignettes/articles$

.covrignore

@@ -0,0 +1,3 @@
+R/archive.R
+R/deprecated.R
+

.github/workflows/r.yml

@@ -49,20 +49,31 @@ jobs:
         run: |
           sudo apt-get install libhdf5-dev
           sudo apt-get install libglpk-dev
+          sudo apt-get install pandoc
+
+      - name: Install library on MacOS
+        if: runner.os == 'macOS'
+        run: |
+          brew install hdf5
+          brew install pandoc
+
+      - name: Install library on Windows
+        if: runner.os == 'Windows'
+        run: |
+          choco install pandoc
 
       - name: Install dependencies
         run: |
-          install.packages(c("remotes", "rcmdcheck"))
+          install.packages(c("remotes", "rcmdcheck", "covr"))
           remotes::install_deps(dependencies = TRUE)
         shell: Rscript {0}
 
       - name: Check
-        run: rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning")
+        run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning")
         shell: Rscript {0}
 
       - name: Run codecov
         run: |
-          install.packages("covr")
           covr::codecov()
         shell: Rscript {0}
 

.gitignore

@@ -12,4 +12,11 @@ liger.Rproj
 *.RDS
 *.rds
 .vscode/*
-*.bed
+src/_deps/**
+src/CMakeFiles/**
+src/CPM_modules/**
+src/cmake_install.cmake
+src/CMakeCache.txt
+src/Makefile
+build/*
+vignettes/articles/*_cache/

DESCRIPTION

@@ -1,11 +1,12 @@
 Package: rliger2
 Version: 1.99.0
-Date: 2021-03-09
+Date: 2023-11-09
 Type: Package
 Title: Linked Inference of Genomic Experimental Relationships
 Description: Uses an extension of nonnegative matrix factorization to identify shared and dataset-specific factors. See Welch J, Kozareva V, et al (2019) <doi:10.1016/j.cell.2019.05.006>, and Liu J, Gao C, Sodicoff J, et al (2020) <doi:10.1038/s41596-020-0391-8> for more details.
 Authors@R: c(
   person(given = 'Joshua', family = 'Welch', email = '[email protected]', role = c('aut')),
+  person(given = 'Yichen', family = 'Wang', email = '[email protected]', role = c('aut', 'cre')),
   person(given = 'Chao', family = 'Gao', email = '[email protected]', role = c('aut')),
   person(given = 'Jialin', family = 'Liu', email = '[email protected]', role = c('aut')),
   person(given = 'Joshua', family = 'Sodicoff', email = '[email protected]', role = c('aut', 'ctb')),
@@ -14,9 +15,10 @@ Authors@R: c(
   person(given = 'Paul', family = 'Hoffman', role = 'ctb'),
   person(given = 'Ilya', family = 'Korsunsky', role = 'ctb'),
   person(given = 'Robert', family = 'Lee', role = 'ctb'),
-  person(given = 'Yichen', family = 'Wang', email = 'wayichen@umich.edu', role = c('aut', 'cre'))
+  person(given = 'Andrew', family = 'Robbins', email = 'robbiand@med.umich.edu', role = 'ctb')
   )
 Author: Joshua Welch [aut],
+        Yichen Wang [aut, cre],
         Chao Gao [aut],
         Jialin Liu [aut],
         Joshua Sodicoff [aut, ctb],
@@ -25,14 +27,14 @@ Author: Joshua Welch [aut],
         Paul Hoffman [ctb],
         Ilya Korsunsky [ctb],
         Robert Lee [ctb],
-        Yichen Wang [aut, cre]
-Maintainer: Chao Gao <gchao@umich.edu>
+        Andrew Robbins [ctb]
+Maintainer: Yichen Wang <wayichen@umich.edu>
 BugReports: https://github.com/welch-lab/liger/issues
 URL: https://github.com/welch-lab/liger
-License: GPL-3 | file LICENSE
+License: GPL-3
 biocViews:
 LazyData: true
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
 Encoding: UTF-8
 LinkingTo: Rcpp, RcppArmadillo, RcppEigen, RcppProgress
@@ -41,7 +43,7 @@ Depends:
     methods,
     stats,
     utils,
-    R (>= 2.10)
+    R (>= 3.4)
 Imports:
     circlize,
     cowplot,
@@ -50,8 +52,7 @@ Imports:
     ggplot2,
     grid,
     hdf5r,
-    igraph,
-    leidenbase,
+    leidenAlg (>= 1.1.1),
     lifecycle,
     magrittr,
     RANN,
@@ -65,32 +66,31 @@ Imports:
     viridis
 Suggests:
     AnnotationDbi,
-    doParallel,
-    DoubletFinder,
+    DESeq2,
+    DoubletFinder (>= 2.0.4),
     EnhancedVolcano,
     fgsea,
-    foreach,
     GenomicRanges,
     ggrepel,
     gprofiler2,
-    ica,
     IRanges,
     irlba,
     knitr,
-    mclust,
     org.Hs.eg.db,
-    parallel,
     plotly,
     psych,
+    RcppPlanc,
     reactome.db,
-    reticulate,
-    riverplot,
+    rgl,
+    rglwidget,
     rmarkdown,
+    sankey,
     scattermore (>= 0.7),
     Seurat,
     SeuratObject,
     SingleCellExperiment,
     SummarizedExperiment,
     testthat
 Remotes:
-    chris-mcginnis-ucsf/DoubletFinder
+    chris-mcginnis-ucsf/DoubletFinder,
+    welch-lab/RcppPlanc