Skip to content

Commit d4f7f42

Browse files
authored
Merge pull request #25 from m-jahn/dev
feat: various improvements for loading files, GH actions, linting, R CMD CHECK fixes
2 parents 9ade40e + e0f2c91 commit d4f7f42

File tree

71 files changed

+1827
-1119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1827
-1119
lines changed

.Rbuildignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
^.*\.Rproj$
2+
^\.Rproj\.user$
3+
^\.github$
4+
^LICENSE\.md$
5+
^CODE_OF_CONDUCT\.md$
6+
^CONTRIBUTING\.md$
7+
^README\.Rmd$
8+
^cran-comments\.md$
9+
^CRAN-SUBMISSION$
10+
^_pkgdown\.yml$
11+
^docs$
12+
^vignettes/CustomizeThePlot\.Rmd$
13+
^vignettes/TimeAndMemory\.Rmd$

.github/workflows/R-CMD-check.yaml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
push:
5+
branches: [main, dev]
6+
pull_request:
7+
branches: [main, dev]
8+
workflow_dispatch:
9+
10+
name: R-CMD-check
11+
12+
jobs:
13+
R-CMD-check:
14+
runs-on: ${{ matrix.config.os }}
15+
16+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
17+
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
config:
22+
- {os: macos-latest, r: 'release'}
23+
- {os: windows-latest, r: 'release'}
24+
- {os: ubuntu-latest, r: 'release'}
25+
26+
env:
27+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
28+
R_KEEP_PKG_SOURCE: yes
29+
30+
steps:
31+
- uses: actions/checkout@v3
32+
33+
- uses: r-lib/actions/setup-pandoc@v2
34+
35+
- uses: r-lib/actions/setup-r@v2
36+
with:
37+
r-version: ${{ matrix.config.r }}
38+
http-user-agent: ${{ matrix.config.http-user-agent }}
39+
use-public-rspm: true
40+
41+
- uses: r-lib/actions/setup-r-dependencies@v2
42+
with:
43+
extra-packages: any::rcmdcheck
44+
needs: check
45+
46+
- uses: r-lib/actions/check-r-package@v2
47+
with:
48+
upload-snapshots: true

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
inst/doc
22
.Rhistory
3-
.Rbuildignore
43
.Rproj*
54
.Rproj.user

DESCRIPTION

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
Package: ggcoverage
22
Type: Package
33
Title: Visualize Genome/Protein Coverage with Various Annotations
4-
Version: 1.2.0
5-
Authors@R:
4+
Version: 1.3.0
5+
Authors@R: c(
66
person(given = "Yabing",
77
family = "Song",
88
role = c("aut", "cre"),
9-
email = "songyb0519@gmail.com")
9+
email = "songyb0519@gmail.com"),
10+
person(given = "Michael",
11+
family = "Jahn",
12+
email = "jahn@mpusp.mpg.de",
13+
role = "aut",
14+
comment = c(ORCID = "0000-0002-3913-153X"))
15+
)
1016
Maintainer: Yabing Song <songyb0519@gmail.com>
1117
Description: The goal of 'ggcoverage' is to simplify the process of visualizing genome/protein coverage. It contains functions to
1218
load data from BAM, BigWig, BedGraph or txt/xlsx files, create genome/protein coverage plot, add various annotations to
1319
the coverage plot, including base and amino acid annotation, GC annotation, gene annotation, transcript annotation, ideogram annotation,
1420
peak annotation, contact map annotation, link annotation and peotein feature annotation.
1521
License: MIT + file LICENSE
1622
Encoding: UTF-8
17-
RoxygenNote: 7.3.0
23+
RoxygenNote: 7.3.1
1824
URL: https://showteeth.github.io/ggcoverage/, https://github.com/showteeth/ggcoverage
1925
BugReports: https://github.com/showteeth/ggcoverage/issues
2026
biocViews:
@@ -50,7 +56,7 @@ Imports:
5056
BiocParallel,
5157
openxlsx,
5258
stringr,
53-
ggpp
59+
gridExtra
5460
Suggests:
5561
rmarkdown,
5662
knitr,

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
YEAR: 2022
2-
COPYRIGHT HOLDER: ggtrack authors
1+
YEAR: 2022-2024
2+
COPYRIGHT HOLDER: ggcoverage authors

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MIT License
22

3-
Copyright (c) 2022 ggcoverage authors
3+
Copyright (c) 2022-2024 ggcoverage authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

NAMESPACE

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,14 @@ importFrom(RColorBrewer,brewer.pal)
7373
importFrom(Rsamtools,ScanBamParam)
7474
importFrom(Rsamtools,indexBam)
7575
importFrom(S4Vectors,"values<-")
76+
importFrom(dplyr,all_of)
7677
importFrom(dplyr,arrange)
7778
importFrom(dplyr,filter)
7879
importFrom(dplyr,group_by)
80+
importFrom(dplyr,mutate)
7981
importFrom(dplyr,select)
8082
importFrom(dplyr,summarise)
83+
importFrom(dplyr,summarize)
8184
importFrom(ggbio,layout_karyogram)
8285
importFrom(ggforce,geom_bezier)
8386
importFrom(ggh4x,elem_list_rect)
@@ -90,6 +93,7 @@ importFrom(ggplot2,aes_string)
9093
importFrom(ggplot2,annotate)
9194
importFrom(ggplot2,arrow)
9295
importFrom(ggplot2,coord_cartesian)
96+
importFrom(ggplot2,cut_width)
9397
importFrom(ggplot2,element_blank)
9498
importFrom(ggplot2,element_rect)
9599
importFrom(ggplot2,element_text)
@@ -118,10 +122,11 @@ importFrom(ggplot2,scale_y_continuous)
118122
importFrom(ggplot2,theme)
119123
importFrom(ggplot2,theme_classic)
120124
importFrom(ggplot2,unit)
121-
importFrom(ggpp,annotate)
122125
importFrom(ggrepel,geom_text_repel)
123126
importFrom(grDevices,col2rgb)
124127
importFrom(grDevices,colorRampPalette)
128+
importFrom(gridExtra,tableGrob)
129+
importFrom(gridExtra,ttheme_default)
125130
importFrom(magrittr,"%>%")
126131
importFrom(methods,extends)
127132
importFrom(openxlsx,read.xlsx)

NEWS.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# ggcoverage 1.3.0
2+
## Major changes
3+
* Refactored `LoadTrack` function.
4+
* Added GH actions workflow to run automatic R CMD CHECK
5+
6+
## Minor changes
7+
* Handle binning for bam files regardless if done via `bamCoverage` or `GenomicAlignments`.
8+
* Various small linting fixes.
9+
* Refactored `ggcoverage.Rmd` and `README.Rmd` in order to remove all lint errors, adhere to R code style
10+
11+
-------------
12+
113
# ggcoverage 1.2.0
214
## Major changes
315
* Support protein coverage and annotation plot (`ggprotein`, `geom_protein`, `geom_feature`).

0 commit comments

Comments
 (0)