Skip to content

Commit

Permalink
merge devel
Browse files Browse the repository at this point in the history
Merge branch 'devel' of https://github.com/microbiome/mia into getCrossAssociation

# Conflicts:
#	man/deprecate.Rd
  • Loading branch information
thpral committed Apr 11, 2024
2 parents 01fa5fb + 1d01162 commit 199ed4d
Show file tree
Hide file tree
Showing 31 changed files with 439 additions and 553 deletions.
286 changes: 0 additions & 286 deletions .github/workflows/check-bioc-devel.yml

This file was deleted.

58 changes: 58 additions & 0 deletions .github/workflows/rworkflows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: rworkflows
'on':
push:
branches:
- master
- main
- devel
- RELEASE_**
pull_request:
branches:
- master
- main
- devel
- RELEASE_**
jobs:
rworkflows:
permissions:
contents: write
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: bioconductor/bioconductor_docker:devel
rspm: https://packagemanager.rstudio.com/cran/__linux__/latest/release
- os: macOS-latest
bioc: devel
r: auto
cont: ~
rspm: ~
- os: windows-latest
bioc: devel
r: auto
cont: ~
rspm: ~
steps:
- uses: neurogenomics/rworkflows@master
with:
run_bioccheck: ${{ false }}
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
enable_act: ${{ false }}
6 changes: 5 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
export(IdTaxaToDataFrame)
export(TAXONOMY_RANKS)
export(ZTransform)
export(addCluster)
export(addContaminantQC)
export(addNotContaminantQC)
export(addPerSampleDominantFeatures)
Expand All @@ -17,7 +18,6 @@ export(calculateJSD)
export(calculateNMDS)
export(calculateOverlap)
export(calculateUnifrac)
export(cluster)
export(countDominantFeatures)
export(countDominantTaxa)
export(estimateDivergence)
Expand All @@ -38,6 +38,7 @@ export(getPrevalentFeatures)
export(getPrevalentTaxa)
export(getRareFeatures)
export(getRareTaxa)
export(getTaxonomyRanks)
export(getTopFeatures)
export(getTopTaxa)
export(getUniqueFeatures)
Expand Down Expand Up @@ -79,6 +80,7 @@ export(runJSD)
export(runNMDS)
export(runOverlap)
export(runUnifrac)
export(setTaxonomyRanks)
export(splitByRanks)
export(splitOn)
export(subsampleCounts)
Expand All @@ -99,6 +101,7 @@ export(unsplitByRanks)
export(unsplitOn)
exportMethods("relabundance<-")
exportMethods(ZTransform)
exportMethods(addCluster)
exportMethods(addContaminantQC)
exportMethods(addHierarchyTree)
exportMethods(addNotContaminantQC)
Expand Down Expand Up @@ -310,6 +313,7 @@ importFrom(tibble,rownames_to_column)
importFrom(tibble,tibble)
importFrom(tidyr,pivot_longer)
importFrom(tidyr,pivot_wider)
importFrom(utils,assignInMyNamespace)
importFrom(utils,combn)
importFrom(utils,head)
importFrom(utils,read.delim)
Expand Down
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,5 @@ Changes in version 1.11.x
+ cluster: Overwrite old results instead of failing
+ getPrevalence: bugfix, if assay contains NA values, it does not end up to NA anymore.
+ getExperimentCrossCorrelation fix: enable using of sampleMap in MAE.
+ Implemented the setTaxonomyRanks function to specify which ranks are recognized as taxonomy ranks.
+ Rename cluster to addCluster
Loading

0 comments on commit 199ed4d

Please sign in to comment.