Skip to content

Commit

Permalink
Merge branch 'main' into update_install_instr
Browse files Browse the repository at this point in the history
  • Loading branch information
adamovanja authored May 30, 2024
2 parents 5bb8027 + bc30858 commit 8d6ff14
Show file tree
Hide file tree
Showing 27 changed files with 160 additions and 682 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/ci-dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: CI
on:
pull_request:
branches: ["main"]
push:
branches: ["main"]

jobs:
ci:
uses: qiime2/distributions/.github/workflows/lib-ci-dev.yaml@dev
with:
distro: metagenome
additional-reports-path: ./coverage.xml
additional-reports-name: coverage

coverage:
needs: [ci]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/download-artifact@v3
name: 'Fetch coverage from builds'
with:
name: ${{ needs.ci.outputs.additional-reports-name }}
path: ${{ needs.ci.outputs.additional-reports-path }}

- uses: codecov/codecov-action@v3
name: 'Upload coverage'
with:
fail_ci_if_error: true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
61 changes: 0 additions & 61 deletions .github/workflows/ci.yml

This file was deleted.

6 changes: 6 additions & 0 deletions .github/workflows/join-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
name: join-release
on:
workflow_dispatch: {}
jobs:
release:
uses: qiime2/distributions/.github/workflows/lib-join-release.yaml@dev
7 changes: 7 additions & 0 deletions .github/workflows/tag-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: tag-release
on:
push:
branches: ["Release-*"]
jobs:
tag:
uses: qiime2/distributions/.github/workflows/lib-tag-release.yaml@dev
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@ test-cov: all

install: all
bash install-sra-tools.sh
maturin build --release -m fastq_writer/Cargo.toml
$(PYTHON) setup.py install
$(PYTHON) -m pip install --no-deps fastq_writer --find-links fastq_writer/target/wheels/

dev: all
bash install-sra-tools.sh
pip install coverage parameterized maturin==0.10.3
pip install coverage parameterized
pip install -e .

clean: distclean
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# q2-fondue
![CI](https://github.com/bokulich-lab/q2-fondue/actions/workflows/ci.yml/badge.svg)
![CI](https://github.com/bokulich-lab/q2-fondue/actions/workflows/ci-dev.yaml/badge.svg)
[![codecov](https://codecov.io/gh/bokulich-lab/q2-fondue/branch/main/graph/badge.svg?token=UTM4W4B1KW)](https://codecov.io/gh/bokulich-lab/q2-fondue)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.6388476.svg)](https://doi.org/10.5281/zenodo.6388476)
[![DOI](http://img.shields.io/badge/DOI-10.1093/bioinformatics/btac639-B31B1B.svg)](https://doi.org/10.1093/bioinformatics/btac639)
Expand Down
15 changes: 5 additions & 10 deletions ci/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,30 @@ build:
make install
requirements:
build:
- maturin ==0.10.3
- rust ==1.58.1

host:
- python {{ python }}
- setuptools

run:
- python {{ python }}
- entrezpy >=2.1.2
- xmltodict
- pyzotero
- python {{ python }}
- python-dotenv
- tqdm >=4.62.3
- entrezpy >=2.1.2
- pyzotero
- q2-types {{ qiime2_epoch }}.*
- qiime2 {{ qiime2_epoch }}.*
- tqdm >=4.62.3

test:
imports:
- q2_fondue
- qiime2.plugins.fondue
- fastq_writer
requires:
- parameterized
- coverage
- pytest-cov
commands:
- pytest --cov q2_fondue --pyargs q2_fondue
- pytest --cov q2_fondue --cov-report xml:coverage.xml --pyargs q2_fondue

about:
home: https://github.com/bokulich-lab/q2-fondue
Expand Down
Loading

0 comments on commit 8d6ff14

Please sign in to comment.