Skip to content

Commit 47c97b1

Browse files
authored
Merge pull request #104 from bcbio/fix_compareversions_ALB
Fix compareVersions alb
2 parents 196e3bd + 98847ba commit 47c97b1

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

inst/templates/methylation/QC/QC.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ setwd(fs::path_dir(getSourceEditorContext()$path))
2727
#. other versions
2828
stopifnot(R.version$major>= 4) # requires R4
2929
if (compareVersion(R.version$minor,"3.1")<0) warning("We recommend >= R4.3.1")
30-
stopifnot(compareVersion(BiocManager::version(), "3.18")>=0)
30+
stopifnot(compareVersion(as.character(BiocManager::version()), "3.18")>=0)
3131
```
3232

3333
This code is in this ![](https://img.shields.io/badge/status-draft-grey) revision.

inst/templates/multiomics/teaseq/QC/QC.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ setwd(fs::path_dir(getSourceEditorContext()$path))
7777
# NOTE: This code will check version, this is our recommendation, it may work
7878
#. other versions
7979
stopifnot(R.version$major>= 4) # requires R4
80-
stopifnot(compareVersion(R.version$minor,"3.3")==0) # requires >=4.3.3
81-
stopifnot(compareVersion(BiocManager::version(), "3.18")>=0)
80+
stopifnot(compareVersion(R.version$minor,"3.3")>=0) # requires >=4.3.3
81+
stopifnot(compareVersion(as.character(BiocManager::version()), "3.18")>=0)
8282
```
8383

8484
This code is in this ![](https://img.shields.io/badge/status-draft-grey) revision.

inst/templates/singlecell/scripts/seurat_init.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ setwd(fs::path_dir(getSourceEditorContext()$path))
44
# NOTE: This code will check version, this is our recommendation, it may work
55
#. other versions
66
stopifnot(R.version$major>= 4) # requires R4
7-
stopifnot(compareVersion(R.version$minor,"3.3")==0) # requires >=4.3.3
8-
stopifnot(compareVersion(BiocManager::version(), "3.18")>=0)
9-
stopifnot(compareVersion(package.version("Seurat"), "5.0.0")>=0)
7+
stopifnot(compareVersion(R.version$minor,"3.3")>=0) # requires >=4.3.3
8+
stopifnot(compareVersion(as.character(BiocManager::version()), "3.18")>=0)
9+
stopifnot(compareVersion(as.character(packageVersion("Seurat")), "5.0.0")>=0)
1010

1111
library(Seurat)
1212
library(data.table)

inst/templates/singlecell_delux/CellToCell/cellchat.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ setwd(fs::path_dir(getSourceEditorContext()$path))
2929
# NOTE: This code will check version, this is our recommendation, it may work
3030
#. other versions
3131
stopifnot(R.version$major>= 4) # requires R4
32-
stopifnot(compareVersion(R.version$minor,"3.3")==0) # requires >=4.3.3
32+
stopifnot(compareVersion(R.version$minor,"3.3")>=0) # requires >=4.3.3
3333
stopifnot(compareVersion(as.character(BiocManager::version()), "3.18")>=0)
3434
stopifnot(compareVersion(as.character(packageVersion("Seurat")), "5.0.0")>=0)
3535
```

inst/templates/spatial/cosmx/01_quality_assessment/QC.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ setwd(fs::path_dir(getSourceEditorContext()$path))
3232
#. other versions
3333
stopifnot(R.version$major>= 4) # requires R4
3434
if (compareVersion(R.version$minor,"3.1")<0) warning("We recommend >= R4.3.1")
35-
stopifnot(compareVersion(BiocManager::version(), "3.18")>=0)
36-
stopifnot(compareVersion(package.version("Seurat"), "5.0.0")>=0)
35+
stopifnot(compareVersion(as.character(BiocManager::version()), "3.18")>=0)
36+
stopifnot(compareVersion(as.character(packageVersion("Seurat")), "5.0.0")>=0)
3737
```
3838

3939
This code is in this ![](https://img.shields.io/badge/status-draft-grey) revision.

inst/templates/spatial/visium/01_quality_assessment/qc.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ setwd(fs::path_dir(getSourceEditorContext()$path))
2828
#. other versions
2929
stopifnot(R.version$major>= 4) # requires R4
3030
if (compareVersion(R.version$minor,"3.1")<0) warning("We recommend >= R4.3.1")
31-
stopifnot(compareVersion(BiocManager::version(), "3.18")>=0)
32-
stopifnot(compareVersion(package.version("Seurat"), "5.0.0")>=0)
31+
stopifnot(compareVersion(as.character(BiocManager::version()), "3.18")>=0)
32+
stopifnot(compareVersion(as.character(packageVersion("Seurat")), "5.0.0")>=0)
3333
```
3434

3535
This code is in this ![](https://img.shields.io/badge/status-draft-grey) revision.

0 commit comments

Comments
 (0)