Skip to content

Commit 84171c3

Browse files
authored
Merge pull request #13 from cokelaer/main
Fixing CI, requirements-->tools, add env.yml
2 parents 6c44c5f + 8b4fa5e commit 84171c3

File tree

4 files changed

+31
-17
lines changed

4 files changed

+31
-17
lines changed

.github/workflows/apptainer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ jobs:
5555
5656
- name: testing
5757
run: |
58-
sequana_nanomerge --input-directory test/data/barcoded --samplesheet test/data/samplesheet.csv --input-pattern "barcode*/*fastq.gz" --summary test/data/sequence_summary.txt --use-apptainer && cd nanomerge && sh nanomerge.sh
58+
sequana_nanomerge --input-directory test/data/barcoded --sample-sheet test/data/samplesheet.csv --input-pattern "barcode*/*fastq.gz" --summary test/data/sequence_summary.txt --use-apptainer && cd nanomerge && sh nanomerge.sh
5959

.github/workflows/main.yml

+17-16
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches:
77
- main
88
- dev
9+
workflow_dispatch:
910
pull_request:
1011
branches-ignore: []
1112
schedule:
@@ -30,33 +31,33 @@ jobs:
3031
- name: checkout git repo
3132
uses: actions/checkout@v2
3233

33-
- name: Set up Python 3.X
34-
uses: actions/setup-python@v2
34+
- name: conda/mamba
35+
uses: mamba-org/provision-with-micromamba@main
3536
with:
36-
python-version: ${{ matrix.python }}
37+
environment-file: environment.yml
38+
extra-specs: |
39+
python=${{ matrix.python }}
3740
38-
- name: Add conda to system path
39-
run: |
40-
# $CONDA is an environment variable pointing to the root of the miniconda directory
41-
echo $CONDA/bin >> $GITHUB_PATH
4241
43-
- name: Install dependencies
42+
- name: install package itself
43+
shell: bash -l {0}
4444
run: |
45-
pip install pycoQC
46-
pip install .[testing]
45+
pip install .
4746
48-
- name: install package itself
47+
- name: Install dependencies
48+
shell: bash -l {0}
4949
run: |
50-
pip install .
50+
pip install coveralls pytest-cov pytest pytest-xdist
5151
5252
- name: testing
53+
shell: bash -l {0}
5354
run: |
54-
pytest --cov-report term --cov=sequana_pipelines.nanomerge
55+
pytest -v --cov-report term-missing --cov=sequana_pipelines.nanomerge
56+
5557
- name: coveralls
58+
shell: bash -l {0}
5659
run: |
5760
echo $COVERALLS_REPO_TOKEN
5861
coveralls --service=github
5962
env:
60-
GITHUB_TOKEN: ${{ github.token }}
61-
62-
63+
GITHUB_TOKEN: ${{ github.token }}

environment.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: nanomerge
2+
3+
channels:
4+
- conda-forge
5+
- bioconda
6+
- defaults
7+
8+
dependencies:
9+
- pycoQC
10+
- pip:
11+
- sequana
12+
13+

0 commit comments

Comments
 (0)