Skip to content
Open

Main #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
079c73b
Remove paper figures and preprocessing scripts
ritamtbsilva Aug 12, 2025
5635b1a
add info on paper scripts to readme file
ritamtbsilva Aug 12, 2025
c833748
Delete LICENSE
ritamtbsilva Aug 12, 2025
c904d64
adapt readme to include visualisation plots for enrichment in benchma…
ritamtbsilva Aug 14, 2025
2724c16
Update pkgdown.yaml
ritamtbsilva Aug 14, 2025
5f32fa8
Update R-CMD-check.yaml
ritamtbsilva Aug 14, 2025
9c038a0
Update Rminversion.yaml
ritamtbsilva Aug 14, 2025
971889f
Update bioc-check.yml
ritamtbsilva Aug 14, 2025
7acf217
Delete
ritamtbsilva Aug 14, 2025
4cab87e
Revert "Delete"
ritamtbsilva Aug 14, 2025
e6e44c1
Update pkgdown.yaml
ritamtbsilva Aug 18, 2025
8ddcb77
Merge pull request #67 from DiseaseTranscriptomicsLab/default
ritamtbsilva Aug 18, 2025
4c1f543
Update .gitignore
ritamtbsilva Aug 18, 2025
6585789
update branches to run checks
ritamtbsilva Aug 18, 2025
92e2058
Merge pull request #68 from DiseaseTranscriptomicsLab/default
ritamtbsilva Aug 18, 2025
7f24fd3
convert vignettes to article and add general vignette
ritamtbsilva Aug 18, 2025
237ae5c
update readme
ritamtbsilva Aug 18, 2025
8f2f5da
Update .gitignore
ritamtbsilva Aug 18, 2025
441a665
update links introduction vignette
ritamtbsilva Aug 19, 2025
880f08b
update date and author vignettes
ritamtbsilva Aug 19, 2025
86fe730
Update required R version to > 4.4.0
ritamtbsilva Aug 19, 2025
829ba0b
fix NAMESPACE and DESCRIPTION's imports
ritamtbsilva Aug 19, 2025
eafdda0
add runnable example VariableAssociation
ritamtbsilva Aug 19, 2025
83ffd91
fix R CMD check notes
ritamtbsilva Aug 19, 2025
795790d
fix BiocCheck notes
ritamtbsilva Aug 20, 2025
8f8190d
remove unecessary commented code
ritamtbsilva Aug 20, 2025
692f8dd
remove unecessary badges from readme, for bioconductor submission
ritamtbsilva Aug 20, 2025
59bf712
Update bioc-check.yml
ritamtbsilva Aug 20, 2025
08bbb73
Update bioc-check.yml
ritamtbsilva Aug 20, 2025
42cf9b2
fix bug calculateDE preventing pkgdown from compiling article
ritamtbsilva Aug 20, 2025
d794294
Merge branch 'main' of https://github.com/DiseaseTranscriptomicsLab/m…
ritamtbsilva Aug 20, 2025
40c86ca
update workflow image in main
ritamtbsilva Aug 21, 2025
e9ca0b5
fix broken link workflow image
ritamtbsilva Aug 21, 2025
5b20e2e
remove rminversion workflow from github
ritamtbsilva Aug 21, 2025
b6a7260
Update R-CMD-check.yaml
ritamtbsilva Aug 21, 2025
92cf89f
update main vignette to remove optional tags for individual gene and …
ritamtbsilva Aug 21, 2025
79670ec
Merge branch 'main' of https://github.com/DiseaseTranscriptomicsLab/m…
ritamtbsilva Aug 21, 2025
262cb98
removing optional (again)
ritamtbsilva Aug 21, 2025
5be84f1
Merge pull request #69 from DiseaseTranscriptomicsLab/main
ritamtbsilva Aug 21, 2025
246d8a1
Merge pull request #70 from DiseaseTranscriptomicsLab/default
ritamtbsilva Aug 21, 2025
0cbccb2
Merge pull request #71 from DiseaseTranscriptomicsLab/main
ritamtbsilva Aug 21, 2025
70bf477
Update .gitignore
ritamtbsilva Aug 21, 2025
3af8114
Merge branch 'default' of https://github.com/DiseaseTranscriptomicsLa…
ritamtbsilva Aug 21, 2025
01a64e8
remove optional in parenthesis
ritamtbsilva Aug 21, 2025
c806972
Merge pull request #72 from DiseaseTranscriptomicsLab/main
ritamtbsilva Aug 21, 2025
e1ca040
Merge pull request #73 from DiseaseTranscriptomicsLab/default
ritamtbsilva Aug 21, 2025
0d62bdc
update notes with release 0.99.3
ritamtbsilva Aug 21, 2025
8d7dc6d
Merge branch 'default' of https://github.com/DiseaseTranscriptomicsLa…
ritamtbsilva Aug 21, 2025
dae89f9
Update NEWS.md
ritamtbsilva Aug 21, 2025
839ab04
Update pkgdown.yaml
ritamtbsilva Aug 21, 2025
c9d8c15
Update pkgdown.yaml
ritamtbsilva Aug 21, 2025
edc007a
update vignette default branch to not include bioconductor instructions
ritamtbsilva Aug 21, 2025
81a46df
Merge branch 'default' of https://github.com/DiseaseTranscriptomicsLa…
ritamtbsilva Aug 21, 2025
0fff716
update vignette to be more useful
ritamtbsilva Aug 21, 2025
f6335ca
update vignette to be more useful
ritamtbsilva Aug 21, 2025
1e9d383
Update markeR.Rmd
ritamtbsilva Aug 21, 2025
791e61e
marker vignette v1
ritamtbsilva Sep 12, 2025
6d3f148
usage data
ritamtbsilva Sep 12, 2025
e881635
add BiocStyle to Suggests
ritamtbsilva Sep 12, 2025
31a6864
changes in data documentation
ritamtbsilva Sep 17, 2025
36d499e
number sims for fpr = 100
ritamtbsilva Sep 17, 2025
4dcf7b9
changes in gene set similarity function (cold / warm colors, limits, …
ritamtbsilva Sep 17, 2025
677dd4e
update vignette
ritamtbsilva Sep 17, 2025
ffd0abe
ensure compatibility with ggplot2 <= 3.5.2
ritamtbsilva Sep 17, 2025
22ff531
add warning on ggplot
ritamtbsilva Sep 17, 2025
6181d5d
minor changes
ritamtbsilva Sep 17, 2025
5c66613
Update NEWS.md
ritamtbsilva Sep 17, 2025
c9aaf4e
Minor fix in `.onAttach()`
ritamtbsilva Sep 17, 2025
d8961f5
Merge branch 'default' into main
ritamtbsilva Sep 17, 2025
4c58b64
Merge pull request #75 from DiseaseTranscriptomicsLab/main
ritamtbsilva Sep 17, 2025
2b431f6
Revert "Merge branch 'default' into main"
ritamtbsilva Sep 17, 2025
2447feb
Revert "Merge pull request #75 from DiseaseTranscriptomicsLab/main"
ritamtbsilva Sep 17, 2025
20e32c3
Reapply "Merge pull request #75 from DiseaseTranscriptomicsLab/main"
ritamtbsilva Sep 17, 2025
d3da934
Update pkgdown.yaml
ritamtbsilva Sep 17, 2025
db5fafe
clarify vignettes
ritamtbsilva Sep 19, 2025
504139a
Update package description to reflect current functionalities
ritamtbsilva Oct 1, 2025
988fb12
change back version
ritamtbsilva Oct 1, 2025
380b681
bug fix: change description to better reflect the package's current f…
ritamtbsilva Oct 1, 2025
d08ed01
bug fix: change version to new bumped version in readme file
ritamtbsilva Oct 1, 2025
ed5e482
version bump in devel
ritamtbsilva Oct 1, 2025
defebad
bump x.y.z version to even y prior to creation of RELEASE_3_22 branch
jwokaty Oct 29, 2025
7a7e63f
bump x.y.z version to odd y following creation of RELEASE_3_22 branch
jwokaty Oct 29, 2025
525b29d
update version in readme file
ritamtbsilva Oct 31, 2025
2da37c5
Merge pull request #77 from DiseaseTranscriptomicsLab/main
ritamtbsilva Oct 31, 2025
a9025cf
add python
ritamtbsilva Mar 11, 2026
f33d137
new parameter p.adjust.method
ritamtbsilva Mar 11, 2026
c9f63e5
new version 1.1.1
ritamtbsilva Mar 11, 2026
6baef37
Update README.md
ritamtbsilva Mar 11, 2026
5baf1a2
Merge pull request #79 from DiseaseTranscriptomicsLab/main
ritamtbsilva Mar 11, 2026
66ba8b5
move python scripts to main folder
ritamtbsilva Mar 12, 2026
d4cc8f5
clean up python scripts
ritamtbsilva Mar 12, 2026
11c0fce
clean up and fix build after python scripts added
ritamtbsilva Mar 12, 2026
3356098
bump version to 1.1.2
ritamtbsilva Mar 12, 2026
5f71c05
Merge pull request #80 from DiseaseTranscriptomicsLab/main
ritamtbsilva Mar 12, 2026
55addc4
bump x.y.z version to even y prior to creation of RELEASE_3_23 branch
jwokaty Apr 28, 2026
ec844f3
bump x.y.z version to odd y following creation of RELEASE_3_23 branch
jwokaty Apr 28, 2026
6925d8e
release bioc 3.23
ritamtbsilva May 8, 2026
d319036
bioc > v1.2
ritamtbsilva May 8, 2026
1555400
Merge pull request #82 from DiseaseTranscriptomicsLab/default
ritamtbsilva May 8, 2026
561b8d7
dev v1.3
ritamtbsilva May 8, 2026
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
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
^\\.github$
^\\.git$
^codecov\.yml$
^vignettes/articles$
^data_aux$
^python(/.*)?$
9 changes: 8 additions & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
branches: [main, default]
pull_request:
branches: [main, default]
release:
types: [published]
branches: [main, default]
workflow_dispatch:
branches: [main, default]

name: R-CMD-check.yaml

Expand Down Expand Up @@ -48,6 +54,7 @@ jobs:
with:
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
error-on: '"error"'

- name: Test coverage
if: runner.os == 'Linux' && matrix.config.r == 'release'
Expand Down
36 changes: 0 additions & 36 deletions .github/workflows/Rminversion.yaml

This file was deleted.

13 changes: 9 additions & 4 deletions .github/workflows/bioc-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@ name: Bioconductor Check

on:
push:
branches: [main, master]
branches: [main, default]
pull_request:
branches: [main, master]
branches: [main, default]
release:
types: [published]
branches: [main, default]
workflow_dispatch:
branches: [main, default]

jobs:
bioccheck:
Expand All @@ -13,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
r-version: ['4.4.0','4.5.0']
r-version: ['4.5.0']

steps:
- uses: actions/checkout@v4
Expand All @@ -37,4 +42,4 @@ jobs:

- name: Run BiocCheck
run: BiocCheck::BiocCheck(".", quit_with_status=TRUE)
shell: Rscript {0}
shell: Rscript {0}
5 changes: 4 additions & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
branches: [default]
pull_request:
branches: [default]
release:
types: [published]
branches: [default]
workflow_dispatch:
branches: [default]

name: pkgdown.yaml

Expand Down
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
docs
renv.lock
.obsidian/
/inst/Paper/data/
/inst/Paper/localjobs/
markeR.BiocCheck/
/doc/
/Meta/
markeR.Rproj
.DS_Store
**/.DS_Store
**/.DS_Store
inst/doc
data_aux
markeR.Rcheck
/python/.venv
21 changes: 12 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: markeR
Title: An R Toolkit for Evaluating Gene Signatures as Phenotypic Markers
Version: 0.99.2
Version: 1.3
Authors@R:
c(
person("Rita", "Martins-Silva",
Expand All @@ -14,17 +14,18 @@ Authors@R:
comment=c(ORCID="0000-0002-1215-0538"))
)
Description:
markeR provides a suite of methods for using gene sets (signatures) to quantify and evaluate the
extent to which a given gene signature marks a specific phenotype. The package implements various
scoring, enrichment and classification approaches, along with tools to compute
performance metrics and visualize results, making it a valuable resource for transcriptomics research (bulk RNA-seq).
markeR is an R package that provides a modular and extensible framework for the systematic evaluation of gene sets as
phenotypic markers using transcriptomic data. The package is designed to support both quantitative analyses and visual exploration of
gene set behaviour across experimental and clinical phenotypes. It implements multiple methods, including score-based and enrichment
approaches, and also allows the exploration of expression behaviour of individual genes. In addition, users can assess the
similarity of their own gene sets against established collections (e.g., those from MSigDB), facilitating biological interpretation.
License: Artistic-2.0
biocViews: GeneExpression, Transcriptomics, Visualization, Software, GeneSetEnrichment, Classification
Encoding: UTF-8
Language: en-GB
LazyData: false
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.2
RoxygenNote: 7.3.3
Additional_repositories: https://bioconductor.org/packages/release/bioc
Imports:
circlize,
Expand All @@ -46,7 +47,6 @@ Imports:
limma,
ggrepel,
effectsize,
patchwork,
msigdbr,
tibble
Suggests:
Expand All @@ -59,11 +59,14 @@ Suggests:
rmarkdown,
roxygen2,
mockery,
covr
covr,
magick,
BiocStyle
Config/testthat/edition: 3
Depends:
R (>= 3.5.0)
R (>= 4.5.0)
URL: https://diseasetranscriptomicslab.github.io/markeR/,
https://github.com/DiseaseTranscriptomicsLab/markeR
BugReports: https://github.com/DiseaseTranscriptomicsLab/markeR/issues
VignetteBuilder: knitr
Config/Needs/website: rmarkdown
180 changes: 0 additions & 180 deletions LICENSE

This file was deleted.

Loading
Loading