Skip to content

Commit

Permalink
Merge pull request #51 from adrientaudiere/dev
Browse files Browse the repository at this point in the history
Try to debug test-coverage and build github action
  • Loading branch information
adrientaudiere authored Dec 12, 2023
2 parents ba69726 + 7f783a5 commit 86f0ed7
Show file tree
Hide file tree
Showing 12 changed files with 92 additions and 59 deletions.
1 change: 1 addition & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ jobs:
- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
args: 'c("--no-tests", "--as-cran", "--no-vignettes", "--no-build-vignettes", "--timing")'
8 changes: 8 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ jobs:
- name: Install blastn
run: sudo apt-get install ncbi-blast+

- name: Install mumu
run: >
git clone https://github.com/frederic-mahe/mumu.git \
&& cd ./mumu/\
&& make\
&& make check\
&& sudo make install
- name: Test coverage
run: |
covr::codecov(
Expand Down
3 changes: 1 addition & 2 deletions MiscMetabar.Rproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ StripTrailingWhitespace: Yes
BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
PackageBuildArgs: --resave-data
PackageCheckArgs: --as-cran
PackageCheckArgs: --as-cran
PackageRoxygenize: rd,collate,namespace

SpellingDictionary: en_US
20 changes: 10 additions & 10 deletions R/data.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@
"data_fungi_sp_known"

#' This tutorial explore the dataset from Tengeler et al. (2020) available in the `mia` package.
#' obtain using `mia::makePhyloseqFromTreeSE(Tengeler2020)`
#'
#' obtain using `mia::makePhyloseqFromTreeSE(Tengeler2020)`
#'
#' This is a phyloseq version of the Tengeler2020 dataset.
#'
#'
#' Tengeler2020 includes gut microbiota profiles of 27 persons with ADHD.
#' A standard bioinformatic and statistical analysis done to demonstrate that altered microbial
#' composition could be a driver of altered brain structure and function and concomitant changes
#' in the animals behavior. This was investigated by colonizing young, male,
#' A standard bioinformatic and statistical analysis done to demonstrate that altered microbial
#' composition could be a driver of altered brain structure and function and concomitant changes
#' in the animals behavior. This was investigated by colonizing young, male,
#' germ-free C57BL/6JOlaHsd mice with microbiota from individuals with and without ADHD.
#'
#' Tengeler, A.C., Dam, S.A., Wiesmann, M. et al. Gut microbiota from persons with
#' Tengeler, A.C., Dam, S.A., Wiesmann, M. et al. Gut microbiota from persons with
#' attention-deficit/hyperactivity disorder affects the brain in mice. Microbiome 8, 44 (2020).
#' https://microbiomejournal.biomedcentral.com/articles/10.1186/s40168-020-00816-x
#' @format
#' @format
#' A phyloseq object
#'
"Tengeler2020_pq"
#'
"Tengeler2020_pq"
7 changes: 4 additions & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ knitr::opts_chunk$set(
collapse = TRUE,
comment = "#>",
fig.path = "man/figures/README-",
out.width = "100%"
out.width = "100%",
message = FALSE
)
```

Expand Down Expand Up @@ -78,12 +79,12 @@ devtools::install_github("adrientaudiere/MiscMetabar", ref = "dev")

See vignettes in the [MiscMetabar](https://adrientaudiere.github.io/MiscMetabar/) website for more examples.

For an introduction to metabarcoding in R, Please visite the [state of the field](https://adrientaudiere.github.io/MiscMetabar/articles/states_of_fields_in_R.html) vignettes. The [import, export and track]() vignette explains how import and export https://adrientaudiere.github.io/MiscMetabar/articles/Reclustering.html. Its also show how to summarize useful information (number of sequences, samples and clusters) accross bioinformatic pipelines.
For an introduction to metabarcoding in R, Please visite the [state of the field](https://adrientaudiere.github.io/MiscMetabar/articles/states_of_fields_in_R.html) vignettes. The [import, export and track](https://adrientaudiere.github.io/MiscMetabar/articles/import_export_track.html) vignette explains how import and export `phyloseq` object. Its also show how to summarize useful information (number of sequences, samples and clusters) accross bioinformatic pipelines.

If you are interested in ecological metrics, see the vignettes describing [alpha-diversity](https://adrientaudiere.github.io/MiscMetabar/articles/alpha-div.html) and [beta-diversity](https://adrientaudiere.github.io/MiscMetabar/articles/beta-div.html) analysis.
The vignette [filter taxa and samples](https://adrientaudiere.github.io/MiscMetabar/articles/filter.html) describes some data-filtering processes using MiscMetabar and the [reclustering](https://adrientaudiere.github.io/MiscMetabar/articles/Reclustering.html) tutorial introduces the different way of clustering already-clustered OTU/ASV. The vignette [tengeler]() explore the dataset from Tengeler et al. (2020) using some MiscMetabar functions.

For developers, I also have a vignette describing som [rules of codes](https://adrientaudiere.github.io/MiscMetabar/articles/Rules.html).
For developers, I also wrote a vignette describing som [rules of codes](https://adrientaudiere.github.io/MiscMetabar/articles/Rules.html).


### Summarize a physeq object
Expand Down
3 changes: 2 additions & 1 deletion man/blast_to_phyloseq.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/count_seq.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/subsample_fastq.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 31 additions & 8 deletions pkgdown/extra.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
.fl {color: blue;}
.fu {color: blue;} /* function */
.ch,.st {color: orange;} /* string */
.kw {color: black;} /* keyword */
.co {color: green;} /* comment */
.fl {
color: blue;
}
.fu {
color: blue;
} /* function */
.ch,
.st {
color: orange;
} /* string */
.kw {
color: black;
} /* keyword */
.co {
color: green;
} /* comment */

.message {
color: gray;
font-weight: bolder;
}
.error {
color: red;
font-weight: bolder;
}
.warning {
color: purple;
font-weight: bolder;
}

.message { color: gray; font-weight: bolder;}
.error { color: red; font-weight: bolder;}
.warning { color: purple; font-weight: bolder;
.section {
text-align: justify;
}
Binary file removed tests/testthat/Rplots.pdf
Binary file not shown.
62 changes: 31 additions & 31 deletions tests/testthat/test_figures_taxo.R
Original file line number Diff line number Diff line change
Expand Up @@ -351,37 +351,37 @@ test_that("tax_bar_pq work with data_fungi dataset", {
)
})

test_that("add_funguild_info and plot_guild_pq work with data_fungi dataset", {
expect_s4_class(
df <-
add_funguild_info(
subset_taxa_pq(data_fungi, taxa_sums(data_fungi) > 5000),
taxLevels = c(
"Domain",
"Phylum",
"Class",
"Order",
"Family",
"Genus",
"Species"
)
),
"phyloseq"
)
expect_error(df <-
add_funguild_info(
subset_taxa_pq(data_fungi, taxa_sums(data_fungi) > 5000),
taxLevels = c(
"PHYLLUUM",
"Phylum",
"Class",
"Order",
"Family"
)
))
expect_s3_class(plot_guild_pq(df, clean_pq = TRUE), "ggplot")
expect_s3_class(plot_guild_pq(df, clean_pq = FALSE), "ggplot")
})
# test_that("add_funguild_info and plot_guild_pq work with data_fungi dataset", {
# expect_s4_class(
# df <-
# add_funguild_info(
# subset_taxa_pq(data_fungi, taxa_sums(data_fungi) > 5000),
# taxLevels = c(
# "Domain",
# "Phylum",
# "Class",
# "Order",
# "Family",
# "Genus",
# "Species"
# )
# ),
# "phyloseq"
# )
# expect_error(df <-
# add_funguild_info(
# subset_taxa_pq(data_fungi, taxa_sums(data_fungi) > 5000),
# taxLevels = c(
# "PHYLLUUM",
# "Phylum",
# "Class",
# "Order",
# "Family"
# )
# ))
# expect_s3_class(plot_guild_pq(df, clean_pq = TRUE), "ggplot")
# expect_s3_class(plot_guild_pq(df, clean_pq = FALSE), "ggplot")
# })


test_that("build_phytree_pq work with data_fungi dataset", {
Expand Down
4 changes: 2 additions & 2 deletions vignettes/MiscMetabar.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ knitr::opts_chunk$set(

## Quick overview

For an introduction to metabarcoding in R, Please visite the [state of the field](https://adrientaudiere.github.io/MiscMetabar/articles/states_of_fields_in_R.html) vignettes. The [import, export and track]() vignette explains how import and export https://adrientaudiere.github.io/MiscMetabar/articles/Reclustering.html. Its also show how to summarize useful information (number of sequences, samples and clusters) accross bioinformatic pipelines.
For an introduction to metabarcoding in R, Please visite the [state of the field](https://adrientaudiere.github.io/MiscMetabar/articles/states_of_fields_in_R.html) vignettes. The [import, export and track](https://adrientaudiere.github.io/MiscMetabar/articles/import_export_track.html) vignette explains how import and export `phyloseq` object. Its also show how to summarize useful information (number of sequences, samples and clusters) accross bioinformatic pipelines.

If you are interested in ecological metrics, see the vignettes describing [alpha-diversity](https://adrientaudiere.github.io/MiscMetabar/articles/alpha-div.html) and [beta-diversity](https://adrientaudiere.github.io/MiscMetabar/articles/beta-div.html) analysis.
The vignette [filter taxa and samples](https://adrientaudiere.github.io/MiscMetabar/articles/filter.html) describes some data-filtering processes using MiscMetabar and the [reclustering](https://adrientaudiere.github.io/MiscMetabar/articles/Reclustering.html) tutorial introduces the different way of clustering already-clustered OTU/ASV. The vignette [tengeler]() explore the dataset from Tengeler et al. (2020) using some MiscMetabar functions.

For developers, I also have a vignette describing som [rules of codes](https://adrientaudiere.github.io/MiscMetabar/articles/Rules.html).
For developers, I also wrote a vignette describing som [rules of codes](https://adrientaudiere.github.io/MiscMetabar/articles/Rules.html).

### Summarize a physeq object

Expand Down

0 comments on commit 86f0ed7

Please sign in to comment.