From 7fe4f9ba372bfc463845cafb72d759810be6e0d7 Mon Sep 17 00:00:00 2001 From: Michal Ziemski Date: Tue, 16 Apr 2024 12:41:18 +0200 Subject: [PATCH 1/4] CI: update the distro (#155) --- .github/workflows/ci-dev.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-dev.yaml b/.github/workflows/ci-dev.yaml index 97e99488..0410f7e4 100644 --- a/.github/workflows/ci-dev.yaml +++ b/.github/workflows/ci-dev.yaml @@ -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 @@ -29,3 +29,5 @@ jobs: name: 'Upload coverage' with: fail_ci_if_error: true + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From bb5987443e2d14b2bdd2921bab162768747b335d Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau <54123712+Sann5@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:58:37 +0200 Subject: [PATCH 2/4] DEV: Add PR templates (#114) --- .github/PULL_REQUEST_TEMPLATE/PR_template.md | 38 ++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE/PR_template.md diff --git a/.github/PULL_REQUEST_TEMPLATE/PR_template.md b/.github/PULL_REQUEST_TEMPLATE/PR_template.md new file mode 100644 index 00000000..15660d39 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/PR_template.md @@ -0,0 +1,38 @@ +### What's new +- Describe what was changed in the code and why it is useful or necessary +- Closes # + +```[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= +git fetch origin pull/${PR}/head:pr-${PR} +git checkout pr-${PR} +``` + +2. Let's get you some data to play with: +```bash + +``` + +3. Test it out! +```bash + +``` + +### 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. From d45c699431f1568d7a6e60b070f5201e5769e393 Mon Sep 17 00:00:00 2001 From: DorielaGrabocka <50322943+DorielaGrabocka@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:00:58 +0200 Subject: [PATCH 3/4] ENH: add support for nt kraken database (#150) --- q2_moshpit/kraken2/database.py | 1 + q2_moshpit/plugin_setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/q2_moshpit/kraken2/database.py b/q2_moshpit/kraken2/database.py index effe38a1..4e835221 100644 --- a/q2_moshpit/kraken2/database.py +++ b/q2_moshpit/kraken2/database.py @@ -41,6 +41,7 @@ "pluspfp8": "pluspfp_08gb", "pluspfp16": "pluspfp_16gb", "eupathdb": "eupathdb48", + "nt": "nt", "greengenes": "Greengenes13.5", "rdp": "RDP11.5", "silva132": "Silva132", diff --git a/q2_moshpit/plugin_setup.py b/q2_moshpit/plugin_setup.py index c743dddb..22601561 100644 --- a/q2_moshpit/plugin_setup.py +++ b/q2_moshpit/plugin_setup.py @@ -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), From 3b48539aedec580364d5e3f7f43fb2bc8f7974f0 Mon Sep 17 00:00:00 2001 From: Santiago Castro Dau <54123712+Sann5@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:49:15 +0200 Subject: [PATCH 4/4] CI: bump codecov-action version to v4 (#158) --- .github/workflows/ci-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-dev.yaml b/.github/workflows/ci-dev.yaml index 0410f7e4..bfd90f5b 100644 --- a/.github/workflows/ci-dev.yaml +++ b/.github/workflows/ci-dev.yaml @@ -25,7 +25,7 @@ jobs: name: ${{ needs.ci.outputs.additional-reports-name }} path: ${{ needs.ci.outputs.additional-reports-path }} - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 name: 'Upload coverage' with: fail_ci_if_error: true