Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
colinvwood committed Sep 19, 2024
2 parents 5c9ce47 + 379ae1d commit dfff950
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 193 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ jobs:
- name: Install plugin
shell: bash -l {0}
run: make install
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}


- name: Run tests
shell: bash -l {0}
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,6 @@ cython_debug/
#.idea/

# macOS
.DS_Store
.DS_Store

.vscode
20 changes: 11 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ A [QIIME 2](https://qiime2.org) plugin [developed](https://develop.qiime2.org) b

## Installation instructions

**The following instructions are intended to be a starting point** and should be replaced when `q2-qsip2` is ready to share with others.
They will enable you to install the most recent *development* version of `q2-qsip2`.
Remember that *release* versions should be used for all "real" work (i.e., where you're not testing or prototyping) - if there aren't instructions for installing a release version of this plugin, it is probably not yet intended for use in practice.

### Install Prerequisites

[Miniconda](https://conda.io/miniconda.html) provides the `conda` environment and package manager, and is currently the only supported way to install QIIME 2.
Expand All @@ -22,15 +18,16 @@ conda update conda
### Install development version of `q2-qsip2`

Next, you need to get into the top-level `q2-qsip2` directory.
If you already have this (e.g., because you just created the plugin), this may be as simple as running `cd q2-qsip2`.
If not, you'll need the `q2-qsip2` directory on your computer.
How you do that will differ based on how the package is shared, and ideally the developer will update these instructions to be more specific (remember, these instructions are intended to be a starting point).
For example, if it's maintained in a GitHub repository, you can achieve this by [cloning the repository](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository).
You can achieve this by [cloning the repository](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository), for example with the command:

```shell
git clone https://github.com/colinvwood/q2-qsip2.git
```

Once you have the directory on your computer, change (`cd`) into it.

If you're in a conda environment, deactivate it by running `conda deactivate`.


Then, run:

```shell
Expand Down Expand Up @@ -79,6 +76,11 @@ You should be able to review the help text by running:
qiime qsip2 --help
```

## Accessing the usage tutorial

You can find instructions for performing an example analysis with q2-qsip2 in the [tutorial](https://github.com/colinvwood/q2-qsip2/blob/main/tutorial/tutorial.md).
The data files that you'll need to run that tutorial can be downloaded from [the directory containing the tutorial](https://github.com/colinvwood/q2-qsip2/tree/main/tutorial).

Have fun! 😎

## About
Expand Down
3 changes: 1 addition & 2 deletions q2_qsip2/plugin_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
from q2_qsip2 import __version__
from q2_qsip2.types import QSIP2Data, Unfiltered, Filtered, EAF
from q2_qsip2.workflow import (
standard_workflow, create_qsip_data, subset_and_filter,
resample_and_calculate_EAF
create_qsip_data, subset_and_filter, resample_and_calculate_EAF
)
from q2_qsip2.visualizers._visualizers import (
plot_weighted_average_densities, plot_sample_curves, plot_density_outliers,
Expand Down
1 change: 1 addition & 0 deletions q2_qsip2/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ def create_qsip_data(

return R_qsip_obj


def subset_and_filter(
qsip_data: RS4,
unlabeled_sources: list[str],
Expand Down
Loading

0 comments on commit dfff950

Please sign in to comment.