Browse code

Merge branch 'devel' into RELEASE_3_19

Nicholas Robertson authored on 05/08/2024 00:27:12
Showing 8 changed files

... ...
@@ -4,3 +4,4 @@
4 4
 ^Meta$
5 5
 ^\.vscode$
6 6
 ^_pkgdown\.yml$
7
+^\.github$
7 8
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+*.html
0 2
new file mode 100644
... ...
@@ -0,0 +1,50 @@
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: [devel, master]
6
+  pull_request:
7
+    branches: [devel, master]
8
+  release:
9
+    types: [published]
10
+  workflow_dispatch:
11
+
12
+name: pkgdown.yaml
13
+
14
+permissions: read-all
15
+
16
+jobs:
17
+  pkgdown:
18
+    runs-on: ubuntu-latest
19
+    # Only restrict concurrency for non-PR jobs
20
+    concurrency:
21
+      group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
22
+    env:
23
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
24
+    permissions:
25
+      contents: write
26
+    steps:
27
+      - uses: actions/checkout@v4
28
+
29
+      - uses: r-lib/actions/setup-pandoc@v2
30
+
31
+      - uses: r-lib/actions/setup-r@v2
32
+        with:
33
+          use-public-rspm: true
34
+
35
+      - uses: r-lib/actions/setup-r-dependencies@v2
36
+        with:
37
+          extra-packages: any::pkgdown, local::.
38
+          needs: website
39
+
40
+      - name: Build site
41
+        run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
42
+        shell: Rscript {0}
43
+
44
+      - name: Deploy to GitHub pages 🚀
45
+        if: github.event_name != 'pull_request'
46
+        uses: JamesIves/[email protected]
47
+        with:
48
+          clean: false
49
+          branch: gh-pages
50
+          folder: docs
... ...
@@ -1,7 +1,7 @@
1 1
 Package: lisaClust
2 2
 Type: Package
3 3
 Title: lisaClust: Clustering of Local Indicators of Spatial Association
4
-Version: 1.12.2
4
+Version: 1.12.3
5 5
 Authors@R: c(
6 6
     person("Ellis", "Patrick", , "[email protected]", role = c("aut", "cre")),
7 7
     person("Nicolas", "Canete", , "[email protected]", role = "aut"),
... ...
@@ -42,5 +42,5 @@ Imports:
42 42
     SummarizedExperiment,
43 43
     pheatmap,
44 44
     spatstat.random
45
-Suggests: BiocStyle, knitr, rmarkdown
45
+Suggests: BiocStyle, knitr, rmarkdown, SpatialDatasets
46 46
 RoxygenNote: 7.3.1
... ...
@@ -32,6 +32,7 @@
32 32
 #' cellType <- factor(paste("c", rep(rep(c(1:2), rep(200, 2)), 4), sep = ""))
33 33
 #' imageID <- rep(c("s1", "s2"), c(800, 800))
34 34
 #' cells <- data.frame(x, y, cellType, imageID)
35
+#' cells <- SingleCellExperiment::SingleCellExperiment(colData = cells)
35 36
 #'
36 37
 #' ## Generate regions
37 38
 #' cells <- lisaClust(cells, k = 2)
... ...
@@ -239,6 +240,7 @@ geom_hatching <-
239 240
 #' cellType <- factor(paste("c", rep(rep(c(1:2), rep(200, 2)), 4), sep = ""))
240 241
 #' imageID <- rep(c("s1", "s2"), c(800, 800))
241 242
 #' cells <- data.frame(x, y, cellType, imageID)
243
+#' cells <- SingleCellExperiment::SingleCellExperiment(colData = cells)
242 244
 #'
243 245
 #' ## Generate regions
244 246
 #' cells <- lisaClust(cells, k = 2)
... ...
@@ -120,6 +120,7 @@ y <- round(c(
120 120
 cellType <- factor(paste("c", rep(rep(c(1:2), rep(200, 2)), 4), sep = ""))
121 121
 imageID <- rep(c("s1", "s2"), c(800, 800))
122 122
 cells <- data.frame(x, y, cellType, imageID)
123
+cells <- SingleCellExperiment::SingleCellExperiment(colData = cells)
123 124
 
124 125
 ## Generate regions
125 126
 cells <- lisaClust(cells, k = 2)
... ...
@@ -43,6 +43,7 @@ y <- round(c(
43 43
 cellType <- factor(paste("c", rep(rep(c(1:2), rep(200, 2)), 4), sep = ""))
44 44
 imageID <- rep(c("s1", "s2"), c(800, 800))
45 45
 cells <- data.frame(x, y, cellType, imageID)
46
+cells <- SingleCellExperiment::SingleCellExperiment(colData = cells)
46 47
 
47 48
 ## Generate regions
48 49
 cells <- lisaClust(cells, k = 2)
... ...
@@ -46,10 +46,8 @@ BiocManager::install("lisaClust")
46 46
 
47 47
 ```{r message=FALSE, warning=FALSE}
48 48
 # load required packages
49
-# library(lisaClust)
50
-# library(spicyR)
51
-devtools::load_all("~/spicyR")
52
-devtools::load_all("/dskh/nobackup/alexq/lisaClust")
49
+library(lisaClust)
50
+library(spicyR)
53 51
 library(ggplot2)
54 52
 library(SingleCellExperiment)
55 53
 library(SpatialDatasets)