Skip to content

Commit

Permalink
Merge pull request #17 from william-hutchison/improve-continuous-deve…
Browse files Browse the repository at this point in the history
…lopment

Improve continuous development
  • Loading branch information
william-hutchison authored Jan 15, 2024
2 parents 8eb859c + 2f5ff37 commit c41e08b
Show file tree
Hide file tree
Showing 59 changed files with 2,793 additions and 151 deletions.
49 changes: 49 additions & 0 deletions .github/workflows/rworkflows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: rworkflows
on:
push:
branches:
pull_request:
branches:
jobs:
rworkflows:
permissions: write-all
runs-on: ${{ matrix.config.os }}
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
container: ${{ matrix.config.cont }}
strategy:
fail-fast: ${{ false }}
matrix:
config:
- os: ubuntu-latest
bioc: devel
r: auto
cont: ghcr.io/bioconductor/bioconductor_docker:devel
rspm: ~
- os: macOS-latest
bioc: release
r: auto
cont: ~
rspm: ~
- os: windows-latest
bioc: release
r: auto
cont: ~
rspm: ~
steps:
- uses: neurogenomics/rworkflows@master
with:
run_bioccheck: ${{ true }}
run_rcmdcheck: ${{ true }}
as_cran: ${{ true }}
run_vignettes: ${{ true }}
has_testthat: ${{ true }}
run_covr: ${{ true }}
run_pkgdown: ${{ true }}
has_runit: ${{ false }}
has_latex: ${{ false }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run_docker: ${{ false }}
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
runner_os: ${{ runner.os }}
cache_version: cache-v1
docker_registry: ghcr.io
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: tidySpatialExperiment
Title: Brings SpatialExperiment to the tidyverse
Version: 0.99.9
Version: 0.99.11
Authors@R: c(
person("William", "Hutchison", email = "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0009-0001-6242-4269")),
Expand Down Expand Up @@ -67,7 +67,7 @@ Biarch: true
biocViews: Infrastructure, RNASeq, GeneExpression, Sequencing, Spatial, Transcriptomics, SingleCell
Encoding: UTF-8
LazyData: false
RoxygenNote: 7.2.3
RoxygenNote: 7.3.0
Roxygen: list(markdown = TRUE)
URL: https://github.com/william-hutchison/tidySpatialExperiment
BugReports: https://github.com/william-hutchison/tidySpatialExperiment/issues
4 changes: 0 additions & 4 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ S3method(unnest,tidySpatialExperiment_nested)
export(aggregate_cells)
export(ellipse)
export(rectangle)
export(ellipse)
export(rectangle)
export(unnest_single_cell_experiment)
import(tidySingleCellExperiment)
importFrom(BiocGenerics,cbind)
Expand Down Expand Up @@ -58,8 +56,6 @@ importFrom(dplyr,select)
importFrom(dplyr,select_if)
importFrom(fansi,strwrap_ctl)
importFrom(ggplot2,aes)
importFrom(magrittr,"%$%")
importFrom(magrittr,"%>%")
importFrom(magrittr,equals)
importFrom(magrittr,set_rownames)
importFrom(methods,callNextMethod)
Expand Down
10 changes: 9 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# tidySpatialExperiment 0.99.9

* tidySpatialExperiment now features a NEWS file!
* tidySpatialExperiment now features a `NEWS.md` file!
* The package also now has its own pkgdown website.
* Updated README to better reflect the development of tidyomics ecosystem.

# tidySpatialExperiment 0.99.10

* Rectangular and elliptical gating added by Quentin Clayssen.

# tidySpatialExperiment 0.99.11

* Add rworkflow github actions to support continuous and collaborative development.
2 changes: 0 additions & 2 deletions R/methods.R
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ setMethod("join_features", "SpatialExperiment", function(.data,
#'
#' @description Combine cells into groups based on shared variables and aggregate feature counts.
#'
#' @importFrom magrittr "%>%"
#' @importFrom rlang enquo
#' @importFrom tibble enframe
#' @importFrom Matrix rowSums
Expand Down Expand Up @@ -184,7 +183,6 @@ aggregate_cells <- function(.data, .sample = NULL, slot = "data", assays = NULL,
#'
#' @description Determines whether points specified by spatial coordinates are within a defined rectangle.
#'
#' @importFrom magrittr "%>%"
#' @importFrom dplyr mutate
#'
#' @name rectangle
Expand Down
2 changes: 0 additions & 2 deletions R/utilities.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#'
#' @keywords internal
#'
#' @importFrom magrittr "%>%"
#' @importFrom tibble rowid_to_column
#' @importFrom dplyr mutate
#' @importFrom utils tail
Expand Down Expand Up @@ -108,7 +107,6 @@ setMethod("cbind", "SpatialExperiment", function(..., deparse.level = 1) {
#'
#' @keywords internal
#'
#' @importFrom magrittr "%$%"
#' @importFrom tidyr pivot_longer
#' @importFrom tibble as_tibble
#' @importFrom purrr when
Expand Down
Loading

0 comments on commit c41e08b

Please sign in to comment.