Skip to content

Commit

Permalink
Merge branch 'main' into bump_codecov_action_version
Browse files Browse the repository at this point in the history
  • Loading branch information
Sann5 authored Apr 22, 2024
2 parents cace878 + d45c699 commit be97dcf
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 2 deletions.
38 changes: 38 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/PR_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
### What's new
- Describe what was changed in the code and why it is useful or necessary
- Closes #<issue_number>

```[tasklist]
### Blocked by...
- [ ] merge after user/repo_name#PR_number
- [ ] depends on #PR_number
```

### Run it locally
1. Checkout the PR branch.

> Assuming 1) you already have a local copy of `q2-moshpit` that is installed in editable mode in your activated virtual environment and 2) the working directory is `q2-moshpit`; run the following.
```bash
PR=<PR_number>
git fetch origin pull/${PR}/head:pr-${PR}
git checkout pr-${PR}
```

2. Let's get you some data to play with:
```bash
<your code here>
```

3. Test it out!
```bash
<your code here>
```

### TODO
- [ ] Fill in *Whats new* section. Erase any bullet points that are not used.
- [ ] Erase *Blocked by...* task list if not used.
- [ ] In *Run it locally*, **step 1**, make sure to write the PR number after you have submitted the PR.
- [ ] In *Run it locally*, **step 2**, fill in the code to fetch the inputs to test the code.
- [ ] In *Run it locally*, **step 3**, fill in the code to test the changes.
- [ ] Erase the *TODO* section.
4 changes: 3 additions & 1 deletion .github/workflows/ci-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
ci:
uses: qiime2/distributions/.github/workflows/lib-ci-dev.yaml@dev
with:
distro: shotgun
distro: metagenome
additional-reports-path: ./coverage.xml
additional-reports-name: coverage

Expand All @@ -29,3 +29,5 @@ jobs:
name: 'Upload coverage'
with:
fail_ci_if_error: true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
1 change: 1 addition & 0 deletions q2_moshpit/kraken2/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"pluspfp8": "pluspfp_08gb",
"pluspfp16": "pluspfp_16gb",
"eupathdb": "eupathdb48",
"nt": "nt",
"greengenes": "Greengenes13.5",
"rdp": "RDP11.5",
"silva132": "Silva132",
Expand Down
2 changes: 1 addition & 1 deletion q2_moshpit/plugin_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
['viral', 'minusb', 'standard', 'standard8',
'standard16', 'pluspf', 'pluspf8', 'pluspf16',
'pluspfp', 'pluspfp8', 'pluspfp16', 'eupathdb',
"greengenes", "rdp", "silva132", "silva138"],
'nt', 'greengenes', 'rdp', 'silva132', 'silva138'],
),
'threads': Int % Range(1, None),
'kmer_len': Int % Range(1, None),
Expand Down

0 comments on commit be97dcf

Please sign in to comment.