Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to usethis functions #42

Open
wants to merge 111 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
dd1b5b5
Initial commit
lpantano May 29, 2024
6b4b525
working code to deploy rnaseq
lpantano May 29, 2024
3b5300d
update DESCRIPTION
lpantano May 29, 2024
f8ee357
add app project name
lpantano May 31, 2024
cc29d40
fix typo
lpantano May 31, 2024
271086e
fixing readme and typos in DEG
lpantano Jun 5, 2024
f921522
Update DEG.Rmd
eberdan Jul 2, 2024
0aa7569
first part drafted
eberdan Jul 3, 2024
8e236c1
finished first draft
eberdan Jul 3, 2024
396b167
Merge branch 'main' into hot_fix_release
lpantano Jul 8, 2024
f788824
changed how object saved
eberdan Jul 8, 2024
3a4ed73
initial QC
eberdan Jul 8, 2024
3981525
few edits
eberdan Jul 8, 2024
2770e95
org DE code, add pairwise comparison
lpantano Jul 8, 2024
531a518
add intersection analysis
lpantano Jul 11, 2024
9702600
cellchat template
abartlett004 Jul 19, 2024
3087a0a
Merge remote-tracking branch 'origin/cellchat' into extend_de
lpantano Jul 25, 2024
c322f2d
Merge remote-tracking branch 'origin/emma-scrna' into extend_de
lpantano Jul 25, 2024
48f1b44
move to templates
lpantano Jul 25, 2024
4c723f1
merge magic
lpantano Jul 25, 2024
2a4cf2f
save QC
lpantano Jul 25, 2024
7918f2c
small fix
lpantano Jul 25, 2024
cff4a5c
Initial commit
lpantano Jul 25, 2024
304c57d
update readme and get working projects
lpantano Jul 25, 2024
9b83b1f
remove rmarkdown
lpantano Jul 25, 2024
57f4545
reorg singlecell
lpantano Jul 25, 2024
cb64952
move cell chat
lpantano Jul 25, 2024
ef4f805
remove common information
lpantano Jul 25, 2024
19efbff
rename integration
lpantano Jul 25, 2024
fe38272
remove base project information from analysis
lpantano Jul 25, 2024
6e5d610
get ready for testing
lpantano Jul 26, 2024
5a8401c
update readme
lpantano Jul 26, 2024
eb49e56
move templates
lpantano Jul 31, 2024
d243a70
move qc single cell
lpantano Jul 31, 2024
57d1ff0
remove file
lpantano Jul 31, 2024
0a1dcfa
remove old files
lpantano Jul 31, 2024
94a149e
trigger name change
lpantano Jul 31, 2024
c67499a
remove rnaseq
lpantano Jul 31, 2024
b9a3c05
try to fix names in rnaseq
lpantano Jul 31, 2024
3a42cff
fix folders
lpantano Jul 31, 2024
b3fb4af
Create readme.md
abartlett004 Aug 1, 2024
25f15bf
remove dependencies, fix base deployment
lpantano Aug 1, 2024
8954ba2
remove deseq2 as dep
lpantano Aug 1, 2024
e143dd7
rough draft of methylation template
abartlett004 Aug 7, 2024
3336b5b
add test of copied files
lpantano Aug 8, 2024
022ccc5
roll back function name
lpantano Aug 8, 2024
006aa7c
add test of sc folders and app
lpantano Aug 9, 2024
3f65860
make comments until ready to export
lpantano Aug 9, 2024
10ef7ad
get all files in templates
lpantano Aug 9, 2024
342d205
add gitignore template
lpantano Aug 9, 2024
61e114c
Update README.md
abartlett004 Aug 9, 2024
7ac5d1a
Update gitignore
abartlett004 Aug 9, 2024
07bde9a
make load_data common to qc and de
lpantano Aug 13, 2024
b9eed18
Merge branch 'devel' of github.com:bcbio/bcbioR into devel
lpantano Aug 13, 2024
44ac670
dont run in macosx
lpantano Aug 13, 2024
e96d3b4
no special chars in sample names
abartlett004 Aug 16, 2024
b405bae
Merge pull request #44 from bcbio/methylation
lpantano Aug 23, 2024
64a1e99
0.3.0alpha release
lpantano Aug 23, 2024
99845f2
Merge branch 'devel' of github.com:bcbio/bcbioR into devel
lpantano Aug 23, 2024
b216020
add credit
lpantano Aug 23, 2024
08af050
first draft
abartlett004 Aug 23, 2024
9972431
Update QC.rmd
eberdan Aug 26, 2024
727bff9
modify for multiple lanes per sample
abartlett004 Aug 26, 2024
d6624c5
Update seurat_init.R
eberdan Aug 28, 2024
5e1ae00
Update QC.rmd
eberdan Aug 29, 2024
f3fbeb6
upset plot for overlap between peaks
abartlett004 Aug 30, 2024
84d93df
Update load_data.R
abartlett004 Sep 4, 2024
23b01c4
fix narrowpeak bugs
abartlett004 Sep 4, 2024
e7bff90
Merge branch 'chipseq_qc' of github.com:bcbio/bcbioR into chipseq_qc
abartlett004 Sep 4, 2024
00a6cca
Merge pull request #46 from bcbio/chipseq_qc
lpantano Sep 4, 2024
26240c4
HTO demux
abartlett004 Sep 6, 2024
ef85fdc
Merge branch 'devel' of github.com:bcbio/bcbioR into devel
abartlett004 Sep 6, 2024
695962c
gsva template
abartlett004 Sep 10, 2024
8f9b2aa
finish comparision intersection code
lpantano Sep 11, 2024
eec545b
geneset from github, gmt from clusterprofiler, failsafe for no sig pa…
abartlett004 Sep 11, 2024
b0208fd
Merge branch 'devel' of github.com:bcbio/bcbioR into devel
lpantano Sep 11, 2024
ee83582
finish two way comparison
lpantano Sep 11, 2024
8050b4f
adapt GSEA and ORA
lpantano Sep 11, 2024
1d4406e
start library functions for FA
lpantano Sep 11, 2024
cea2662
first attempt to use controlled gmt files
lpantano Sep 11, 2024
e15f253
get gitignores
lpantano Sep 12, 2024
c4d5c32
update readme with right commands
lpantano Sep 12, 2024
00dcfd7
fix example of command line
lpantano Sep 12, 2024
fdfdfca
update tests
lpantano Sep 12, 2024
04f41f4
Update QC.Rmd
abartlett004 Sep 13, 2024
f517d42
begin diffbind templates
abartlett004 Sep 19, 2024
8937f22
working samplesheet, produced count matrix
abartlett004 Sep 19, 2024
d6402e5
begin diffbind rmd template
abartlett004 Sep 20, 2024
b7201ba
full report
abartlett004 Sep 26, 2024
46da116
begin adding annotation and functional enrichment
abartlett004 Sep 26, 2024
fb97f8e
investigate peak anno functions
abartlett004 Sep 27, 2024
d30c42e
Add files via upload
eberdan Oct 1, 2024
33f64dc
diffbind text, write files
abartlett004 Oct 1, 2024
7da522b
merge with scrna
abartlett004 Oct 1, 2024
3ec2536
Update README.md
abartlett004 Oct 1, 2024
8181c8a
Update readme.md
abartlett004 Oct 1, 2024
2551479
add non-example params files
abartlett004 Oct 1, 2024
9dda952
merge with remote
abartlett004 Oct 1, 2024
5c912d7
Update readme.md
abartlett004 Oct 1, 2024
c9d6339
begin feedback from meeting
abartlett004 Oct 3, 2024
eda970d
merge with remote
abartlett004 Oct 3, 2024
98ac197
fix rnaseq readme and add sc test dataset
lpantano Oct 4, 2024
d3a8047
merge changes
lpantano Oct 4, 2024
1b7dc26
adding checks and status to all rmd
lpantano Oct 9, 2024
1dad379
remove former hcbc readme
lpantano Oct 9, 2024
282c730
add venn diagram to chipseq qc
abartlett004 Oct 10, 2024
7e9001d
merge chipseq qc
abartlett004 Oct 10, 2024
a0ad6c9
start edits to diffbind
abartlett004 Oct 10, 2024
1e718b3
annotation and ora for diffbind, fix typo in DEG.Rmd
abartlett004 Oct 11, 2024
c1aa8fc
fix checking version text and finish sc integration
lpantano Oct 11, 2024
983a73d
fix conflict
lpantano Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: 'release'}
# - {os: macos-latest, r: 'release'}
#- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,12 @@ docs
/doc/
/Meta/
.DS*
inst/rmarkdown/templates/rnaseq/skeleton/DE/Multiplicative_DGE_Analysis.Rmd
.Rdata
.httr-oauth
.DS_Store
.quarto
inst/templates/chipseq/QC/QC.html
*.html
*.csv
*.qs
20 changes: 12 additions & 8 deletions DESCRIPTION
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: bcbioR
Type: Package
Title: Templates and functions to guide downstream analysis and data interpretation
Version: 0.1.3
Version: 0.3.0
Authors@R: person("Pantano", "Lorena", , "[email protected]",
role = c("aut", "cre"))
Description: Collaborative code repository at the Harvard Chan Bioinformatics Core.
Expand All @@ -11,23 +11,27 @@ Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
Imports:
DESeq2,
stringr,
ggplot2,
magrittr,
hues,
ggprism,
grDevices,
R.utils,
readr,
withr,
usethis,
fs,
withr
jsonlite,
yaml,
whisker,
rlang,
stringr
Suggests:
hues,
ggprism,
ggplot2,
knitr,
rmarkdown,
testthat (>= 3.0.0)
VignetteBuilder: knitr
URL: http://bcb.io/bcbioR/
Config/testthat/edition: 3
Depends:
R (>= 2.10)
R (>= 4.2.0)
Empty file modified LICENSE
100644 → 100755
Empty file.
Empty file modified LICENSE.md
100644 → 100755
Empty file.
9 changes: 4 additions & 5 deletions NAMESPACE
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
# Generated by roxygen2: do not edit by hand

export(bcbio_nfcore_check)
export(bcbio_set_project)
export(bcbio_templates)
export(cb_friendly_cols)
export(cb_friendly_pal)
export(list_cb_friendly_cols)
export(scale_color_cb_friendly)
export(scale_fill_cb_friendly)
import(DESeq2)
import(R.utils)
import(ggplot2)
import(ggprism)
import(hues)
import(fs)
import(usethis)
import(whisker)
import(withr)
importFrom(grDevices,colorRampPalette)
importFrom(magrittr,"%>%")
importFrom(readr,read_csv)
Expand Down
8 changes: 8 additions & 0 deletions NEWS.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# bcbioR 0.3.0

* Support multiple comparisons
* re-structure templates
* Add text with best practices
* Add draft for methylation and spatial
* Add scQC shiny app

# bcbioR 0.1.3

* fix duplicated gene names
Expand Down
8 changes: 4 additions & 4 deletions R/bcbioR-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#' @importFrom readr read_csv
#' @importFrom stringr str_replace_all
## usethis namespace: end
#' @import DESeq2
#' @import ggplot2
#' @import hues
#' @import ggprism
#' @import usethis
#' @import fs
#' @import R.utils
#' @import withr
#' @import whisker
NULL
167 changes: 0 additions & 167 deletions R/hello.R

This file was deleted.

Loading
Loading