Skip to content

Commit

Permalink
Merge branch 'main' into website
Browse files Browse the repository at this point in the history
  • Loading branch information
jiajic committed Oct 28, 2024
2 parents a08d0cc + 1b64c31 commit 36b233e
Show file tree
Hide file tree
Showing 172 changed files with 5,122 additions and 3,654 deletions.
204 changes: 204 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [dev]
pull_request:
branches: [dev]

name: R-CMD-check.yaml

permissions: read-all

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'release'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true



- name: Install reticulate
run: |
Rscript -e "install.packages('reticulate')"
- name: Create miniconda
run: |
Rscript -e "reticulate::install_miniconda()"
Rscript -e "reticulate::conda_install(packages = 'scipy')"
- name: Install pak
run: |
Rscript -e "install.packages('pak')"
- name: Install remotes
run: |
Rscript -e "install.packages('remotes')"
- name: Install GiottoUtils
run: |
Rscript -e "remotes::install_github('drieslab/GiottoUtils@dev')"
- name: Install GiottoData
run: |
Rscript -e "remotes::install_github('drieslab/GiottoData')"
- name: Install rcmdcheck
run: |
Rscript -e "install.packages('rcmdcheck')"
- name: Install knitr
run: |
Rscript -e "install.packages('knitr')"
- name: Install rmarkdown
run: |
Rscript -e "install.packages('rmarkdown')"
- name: Install testthat
run: |
Rscript -e "install.packages('testthat')"
- name: Install BiocCheck
run: |
Rscript -e "install.packages('BiocManager')"
Rscript -e "BiocManager::install('BiocCheck')"
- name: Install dbscan
run: |
Rscript -e "BiocManager::install('dbscan')"
- name: Install deldir
run: |
Rscript -e "BiocManager::install('deldir')"
- name: Install igraph
run: |
Rscript -e "BiocManager::install('igraph')"
- name: Install magick
run: |
Rscript -e "BiocManager::install('magick')"
- name: Install matrixStats
run: |
Rscript -e "BiocManager::install('matrixStats')"
- name: Install sp
run: |
Rscript -e "BiocManager::install('sp')"
- name: Install terra
run: |
Rscript -e "BiocManager::install('terra')"
- name: Install scattermore
run: |
Rscript -e "install.packages('scattermore')"
- name: Install exactextractr
run: |
Rscript -e "install.packages('exactextractr')"
- name: Install future.apply
run: |
Rscript -e "BiocManager::install('future.apply')"
- name: Install stars
run: |
Rscript -e "BiocManager::install('stars')"
- name: Install qs
run: |
Rscript -e "BiocManager::install('qs')"
- name: Install RTriangle
run: |
Rscript -e "BiocManager::install('RTriangle')"
- name: Install geometry
run: |
Rscript -e "BiocManager::install('geometry')"
- name: Install Seurat
run: |
Rscript -e "BiocManager::install('Seurat')"
- name: Install chihaya
run: |
Rscript -e "BiocManager::install('chihaya')"
- name: Install DelayedArray
run: |
Rscript -e "BiocManager::install('DelayedArray')"
- name: Install DelayedMatrixStats
run: |
Rscript -e "BiocManager::install('DelayedMatrixStats')"
- name: Install HDF5Array
run: |
Rscript -e "BiocManager::install('HDF5Array')"
- name: Install rgl
run: |
Rscript -e "BiocManager::install('rgl')"
- name: Install rhdf5
run: |
Rscript -e "BiocManager::install('rhdf5')"
- name: Install S4Vectors
run: |
Rscript -e "BiocManager::install('S4Vectors')"
- name: Install ScaledMatrix
run: |
Rscript -e "BiocManager::install('ScaledMatrix')"
- name: Install SingleCellExperiment
run: |
Rscript -e "BiocManager::install('SingleCellExperiment')"
- name: Install SpatialExperiment
run: |
Rscript -e "BiocManager::install('SpatialExperiment')"
- name: Install STexampleData
run: |
Rscript -e "BiocManager::install('STexampleData')"
- name: Install SummarizedExperiment
run: |
Rscript -e "BiocManager::install('SummarizedExperiment')"
- name: Run BiocCheck
run: |
Rscript -e "BiocCheck::BiocCheck()"
- name: Run rcmdcheck
run: |
Rscript -e "rcmdcheck::rcmdcheck()"
19 changes: 11 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: GiottoClass
Title: Giotto Suite object definitions and framework
Version: 0.3.5
Version: 0.4.0
Authors@R: c(
person("Ruben", "Dries", email = "rubendries@gmail.com",
role = c("aut", "cre"), comment = c(ORCID = "0000-0001-7650-7754")),
Expand All @@ -26,15 +26,13 @@ Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.2
Depends:
base (>= 4.0.1),
utils (>= 4.0.1),
R (>= 4.0.1),
R (>= 4.4.1)
Imports:
checkmate,
data.table (>= 1.12.2),
dbscan (>= 1.1-3),
deldir (>= 1.0.6),
GiottoUtils (>= 0.1.10),
GiottoUtils (>= 0.2.0),
graphics,
grDevices,
igraph (>= 1.2.4.1),
Expand All @@ -43,9 +41,8 @@ Imports:
matrixStats (>= 0.55.0),
methods,
reticulate (>= 1.25),
sp,
stats,
terra (>= 1.7-39)
terra (>= 1.7-41)
Suggests:
Biobase,
chihaya,
Expand All @@ -57,7 +54,6 @@ Suggests:
HDF5Array (>= 1.18.1),
knitr,
plotly,
R.utils,
raster,
remotes,
reshape2,
Expand All @@ -73,6 +69,7 @@ Suggests:
SeuratObject,
sf,
SingleCellExperiment,
sp,
SpatialExperiment,
stars,
STexampleData,
Expand Down Expand Up @@ -107,9 +104,12 @@ Collate:
'interoperability.R'
'join.R'
'methods-IDs.R'
'methods-XY.R'
'methods-affine.R'
'methods-area.R'
'methods-centroids.R'
'methods-coerce.R'
'methods-convHull.R'
'methods-copy.R'
'methods-crop.R'
'methods-dims.R'
Expand All @@ -124,6 +124,7 @@ Collate:
'methods-plot.R'
'methods-rbind.R'
'methods-reconnect.R'
'methods-relate.R'
'methods-rescale.R'
'methods-setGiotto.R'
'methods-shear.R'
Expand All @@ -140,8 +141,10 @@ Collate:
'slot_check.R'
'slot_list.R'
'slot_show.R'
'spatial_binary_ops.R'
'spatial_query.R'
'spatial_structures.R'
'split.R'
'stitch_coordinates.R'
'subset.R'
'suite_reexports.R'
Expand Down
Loading

0 comments on commit 36b233e

Please sign in to comment.