Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ANCOM-BC2 wrapper #136

Open
wants to merge 24 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5f70717
pyright config
colinvwood Oct 30, 2024
9a74bd9
functionality needed to go from feature table, metadata -> phyloseq o…
colinvwood Oct 30, 2024
069eb5d
Merge branch 'dev' into ancombc2
colinvwood Oct 30, 2024
e9e17de
WIP: working towards first rpy2 invocation of ancombc2
colinvwood Nov 8, 2024
3ea40ad
str vector not str
colinvwood Nov 12, 2024
504e7ee
hyphen handling refactor, first types & formats
colinvwood Nov 25, 2024
fdcef25
asymptotic cutoff parameter
colinvwood Nov 25, 2024
90b4151
linting
colinvwood Nov 25, 2024
dd70695
first tests
colinvwood Nov 26, 2024
45c7a05
formula processing and metadata conversion tests
colinvwood Nov 26, 2024
6f4e721
docstrings
colinvwood Nov 26, 2024
2e4918a
ancombc2 citation
colinvwood Nov 26, 2024
65a0a7b
rpy2 dependency
colinvwood Nov 28, 2024
38f9a42
rpy2 dependency the real way
colinvwood Dec 9, 2024
0f31b0e
use jsonl format for output dir fmt
colinvwood Jan 6, 2025
8b0a721
new format tests
colinvwood Jan 6, 2025
a44248b
Merge branch 'dev' into ancombc2
colinvwood Jan 6, 2025
a6e8ea4
small
colinvwood Jan 7, 2025
4b888aa
rename columns post abc2, tests
colinvwood Jan 8, 2025
7c5fb0a
post ANCOMBC2 data polishing, tests
colinvwood Jan 9, 2025
7405811
integrate _process_categorical_variables into main function, other sm…
colinvwood Jan 9, 2025
3c21fb1
rename structural zero columns to allow variable/level separation and…
colinvwood Jan 9, 2025
a307789
suppress R warnings
colinvwood Jan 10, 2025
8e4a826
annotate categorical columns with variable and level as well
colinvwood Jan 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,3 @@ output.summary.txt

# Version file from versioningit
_version.py

1 change: 1 addition & 0 deletions ci/pip_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
biom-format
rpy2
59 changes: 30 additions & 29 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,46 +1,47 @@
package:
name: q2-composition
version: {{ PLUGIN_VERSION }}
version: { { PLUGIN_VERSION } }
source:
path: ..
build:
script: make install
requirements:
host:
- python {{ python }}
- setuptools
- versioningit
- wheel
- python {{ python }}
- setuptools
- versioningit
- wheel
run:
- python {{ python }}
- scikit-bio {{ scikit_bio }}
- biom-format {{ biom_format }}
- scipy {{ scipy }}
- pandas {{ pandas }}
- formulaic
- bioconductor-phyloseq
- bioconductor-ancombc
- r-tidyverse
- r-optparse
- r-frictionless
- qiime2 {{ qiime2_epoch }}.*
- q2templates {{ qiime2_epoch }}.*
- q2-types {{ qiime2_epoch }}.*
- altair
- python {{ python }}
- scikit-bio {{ scikit_bio }}
- biom-format {{ biom_format }}
- scipy {{ scipy }}
- pandas {{ pandas }}
- formulaic
- bioconductor-phyloseq
- bioconductor-ancombc
- r-tidyverse
- r-optparse
- r-frictionless
- qiime2 {{ qiime2_epoch }}.*
- q2templates {{ qiime2_epoch }}.*
- q2-types {{ qiime2_epoch }}.*
- altair
- rpy2 {{ rpy2 }}
build:
- setuptools
- versioningit
- setuptools
- versioningit
test:
requires:
- qiime2 >={{ qiime2 }}
- q2templates >={{ q2templates }}
- q2-types >={{ q2_types }}
- pytest
- qiime2 >={{ qiime2 }}
- q2templates >={{ q2templates }}
- q2-types >={{ q2_types }}
- pytest
imports:
- q2_composition
- qiime2.plugins.composition
- q2_composition
- qiime2.plugins.composition
commands:
- py.test --pyargs q2_composition
- py.test --pyargs q2_composition
about:
home: https://qiime2.org
license: BSD-3-Clause
Expand Down
3 changes: 2 additions & 1 deletion q2_composition/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from ._impute import add_pseudocount
from ._ancom import ancom
from ._ancombc import ancombc
from ._ancombc2 import ancombc2
from ._dataloaf_tabulate import tabulate
from ._diff_abundance_plots import da_barplot

Expand All @@ -25,4 +26,4 @@

__all__ = ['FrictionlessCSVFileFormat', 'DataPackageSchemaFileFormat',
'DataLoafPackageDirFmt', 'DifferentialAbundance', 'add_pseudocount',
'ancom', 'ancombc', 'tabulate', 'da_barplot']
'ancom', 'ancombc', 'ancombc2', 'tabulate', 'da_barplot']
Loading
Loading