Skip to content

Commit dfff950

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 5c9ce47 + 379ae1d commit dfff950

File tree

6 files changed

+136
-193
lines changed

6 files changed

+136
-193
lines changed

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ jobs:
2626
- name: Install plugin
2727
shell: bash -l {0}
2828
run: make install
29+
env:
30+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
31+
2932

3033
- name: Run tests
3134
shell: bash -l {0}

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,6 @@ cython_debug/
163163
#.idea/
164164

165165
# macOS
166-
.DS_Store
166+
.DS_Store
167+
168+
.vscode

README.md

+11-9
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ A [QIIME 2](https://qiime2.org) plugin [developed](https://develop.qiime2.org) b
44

55
## Installation instructions
66

7-
**The following instructions are intended to be a starting point** and should be replaced when `q2-qsip2` is ready to share with others.
8-
They will enable you to install the most recent *development* version of `q2-qsip2`.
9-
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.
10-
117
### Install Prerequisites
128

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

2420
Next, you need to get into the top-level `q2-qsip2` directory.
25-
If you already have this (e.g., because you just created the plugin), this may be as simple as running `cd q2-qsip2`.
26-
If not, you'll need the `q2-qsip2` directory on your computer.
27-
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).
28-
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).
21+
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:
22+
23+
```shell
24+
git clone https://github.com/colinvwood/q2-qsip2.git
25+
```
26+
2927
Once you have the directory on your computer, change (`cd`) into it.
3028

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

33-
3431
Then, run:
3532

3633
```shell
@@ -79,6 +76,11 @@ You should be able to review the help text by running:
7976
qiime qsip2 --help
8077
```
8178

79+
## Accessing the usage tutorial
80+
81+
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).
82+
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).
83+
8284
Have fun! 😎
8385

8486
## About

q2_qsip2/plugin_setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
from q2_qsip2 import __version__
1515
from q2_qsip2.types import QSIP2Data, Unfiltered, Filtered, EAF
1616
from q2_qsip2.workflow import (
17-
standard_workflow, create_qsip_data, subset_and_filter,
18-
resample_and_calculate_EAF
17+
create_qsip_data, subset_and_filter, resample_and_calculate_EAF
1918
)
2019
from q2_qsip2.visualizers._visualizers import (
2120
plot_weighted_average_densities, plot_sample_curves, plot_density_outliers,

q2_qsip2/workflow.py

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ def create_qsip_data(
123123

124124
return R_qsip_obj
125125

126+
126127
def subset_and_filter(
127128
qsip_data: RS4,
128129
unlabeled_sources: list[str],

0 commit comments

Comments
 (0)