Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dev with main #29

Merged
merged 103 commits into from
Jul 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
0a203be
Update LMAS.nf
cimendes Oct 8, 2021
e87deb0
add nextflow CI test
cimendes Oct 11, 2021
cef0949
fix yml
cimendes Oct 11, 2021
99f8e58
Update ci_nextflow.yml
cimendes Oct 11, 2021
bb74bcc
Update ci_nextflow.yml
cimendes Oct 11, 2021
2983495
Update ci_nextflow.yml
cimendes Oct 11, 2021
5c323ed
Update params.config
cimendes Oct 11, 2021
1017f89
Update test.config
cimendes Oct 11, 2021
023c57e
Update ci_nextflow.yml
cimendes Oct 11, 2021
8e3a337
add nextflow command ffor test
cimendes Oct 11, 2021
8d8de88
Update ci_nextflow.yml
cimendes Oct 11, 2021
12fb216
fix memory and cpu params
cimendes Oct 11, 2021
45547ca
try to add option to limit resources globally
cimendes Oct 12, 2021
e43b6be
Update nextflow.config
cimendes Oct 12, 2021
7025855
move resources to main config file
cimendes Oct 12, 2021
8d961e3
fix max_memory param
cimendes Oct 12, 2021
c8b361b
add missing labels
cimendes Oct 12, 2021
5fbe4a3
fix issues created by linter; update test data
cimendes Oct 12, 2021
c088cf2
Update .gitignore
cimendes Oct 12, 2021
9b4a1bc
run ci on main branch
cimendes Oct 12, 2021
16f9d54
up version
cimendes Oct 12, 2021
0673cf8
Create triple_reference.fasta
cimendes Oct 12, 2021
dbefc8c
Merge pull request #16 from cimendes/dev-ci
cimendes Oct 12, 2021
343e829
Update README.md
cimendes Oct 12, 2021
14454f7
fix optional md
cimendes Oct 14, 2021
d7edbc5
Update compile_reports.py
cimendes Oct 14, 2021
d9ac02e
Update LMAS.nf
cimendes Oct 14, 2021
d26e975
Update LMAS.nf
cimendes Oct 14, 2021
74c3c6e
update message in report when md file is not provided
cimendes Oct 14, 2021
1840a7e
Update profiles.config
cimendes Oct 14, 2021
427198d
remove qos
cimendes Oct 14, 2021
231907c
mount basedir in docker containters; adjust results for single sample…
cimendes Oct 16, 2021
b0c08af
bind basedir with singularity
cimendes Oct 16, 2021
230eda4
Update nextflow.config
cimendes Oct 17, 2021
e073ec5
Update LMAS_ECCMID.png
cimendes Oct 19, 2021
c4e4793
Update nextflow.config
cimendes Oct 19, 2021
5573a34
update help message
cimendes Oct 19, 2021
3307460
update README and script to download zymos data
cimendes Oct 19, 2021
5bfa1fa
update docs
cimendes Oct 19, 2021
33ed3cb
Update main.js.zip
cimendes Oct 22, 2021
b6d9ae9
Merge pull request #17 from cimendes/main
cimendes Oct 22, 2021
c851b1c
Update README.md
cimendes Oct 22, 2021
51c8023
dls2 conversion begins...
cimendes Oct 22, 2021
7d6ded0
split processes into modules
cimendes Oct 22, 2021
fe04356
Update README.md
cimendes Oct 25, 2021
729b2e9
Update metrics.rst
cimendes Oct 26, 2021
1c5e2d1
fix bug where secondary mappings were being reported by minimap2
cimendes Oct 27, 2021
ca29b7b
fix typo
cimendes Oct 27, 2021
7e51eac
up version
cimendes Oct 28, 2021
064aad0
Update LMAS.nf
cimendes Oct 28, 2021
e12df08
Add missing assemblers to assembler names list
cimendes Oct 30, 2021
50445f4
Update README.md
cimendes Nov 22, 2021
0d0821f
Update overview.rst
cimendes Nov 22, 2021
05ec276
Update README.md
cimendes Nov 22, 2021
a10ac22
skip placeholder in table when assembly process is skipped
cimendes Nov 23, 2021
70e8292
version bump to 1.1.3
cimendes Nov 23, 2021
7e3bef4
Update LMAS.nf
cimendes Nov 23, 2021
78c9964
Update LMAS_DIAGRAM_FULL.png
cimendes Nov 25, 2021
c1afd34
Merge branch 'main' into dev-dsl2
cimendes Dec 2, 2021
5093bc3
start conversion to dsl2 - better than expected!
cimendes Dec 2, 2021
5ff4bcd
Update README.md
cimendes Dec 6, 2021
0e46037
add mapping workflow, add processes to produce results and final repo…
cimendes Dec 6, 2021
dd5a6e1
change module name
cimendes Dec 6, 2021
2fe90b9
move compile report to separate file
cimendes Dec 6, 2021
b8d2673
move report to separate wf
cimendes Dec 6, 2021
6dcc882
move preprocessing to separate workflow
cimendes Dec 7, 2021
9f6254b
move postprocessing processes to a new module
cimendes Dec 7, 2021
e2539bf
add wrapper for calling LMAS workflow
cimendes Dec 7, 2021
3747487
add README to all modules
cimendes Dec 7, 2021
657dbcc
add eval command
cimendes Dec 7, 2021
4d8bd93
Merge branch 'main' into dev-dsl2
cimendes Dec 7, 2021
f3d80c0
fix process name in conf/containers.config; add check that workflow c…
cimendes Dec 7, 2021
cff660f
add feedback for successful run
cimendes Dec 7, 2021
ce6a09f
Update README.md
cimendes Dec 7, 2021
796629e
update documentation for DSL2
cimendes Dec 9, 2021
a6efa74
Update basic_usage.rst
cimendes Dec 9, 2021
b528669
Merge pull request #18 from B-UMMI/dev-dsl2
cimendes Dec 10, 2021
f63b2fe
add version parameter and bump version
cimendes Mar 25, 2022
efd46c5
add conda badges
cimendes Apr 6, 2022
0b81b91
Update README.md
cimendes Apr 6, 2022
0185338
Update README.md
cimendes Apr 6, 2022
03c9bf9
Update README.md
cimendes Apr 6, 2022
1a50518
Update README.md
cimendes Apr 6, 2022
8326777
Update installation.rst
cimendes Apr 6, 2022
6c94180
Merge pull request #20 from B-UMMI/update_docs
cimendes Apr 7, 2022
0e5c13c
Update README.md
cimendes May 19, 2022
56ee5cb
update ci with singularity test
cimendes Jun 14, 2022
f7edc30
Update ci_nextflow.yml
cimendes Jun 14, 2022
7c44b06
Update profiles.config
cimendes Jun 14, 2022
4698d26
Update ci_nextflow.yml
cimendes Jun 14, 2022
1866cff
Merge pull request #23 from B-UMMI/update_ci
cimendes Jun 14, 2022
c2480d9
Update params.config
cimendes Jun 28, 2022
a49bc93
Merge pull request #24 from B-UMMI/change_defaults_assemblers
cimendes Jun 28, 2022
dee32c2
remove BCALM2 from workflow
cimendes Jun 30, 2022
5d12197
Merge pull request #25 from B-UMMI/remove_bcalm2
cimendes Jul 1, 2022
6870231
Update main.nf
cimendes Jul 1, 2022
7d2aba7
Merge pull request #26 from B-UMMI/remove_bcalm2
cimendes Jul 1, 2022
addc40c
fix bug where gap and snp plots were not being computed for all assem…
cimendes Jul 4, 2022
2ab52d1
remove mention of BCALM2 - deprecated from LMAS
cimendes Jul 4, 2022
d4ad75f
Merge pull request #27 from B-UMMI/fix_gap_plot
cimendes Jul 4, 2022
5e50c52
Update LMAS_ECCMID.png
cimendes Jul 4, 2022
faf0e0a
Fix bug - empty performance table
cimendes Jul 6, 2022
493ca12
Merge pull request #28 from B-UMMI/fix_gap_plot
cimendes Jul 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions .github/workflows/ci_nextflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: CI - Nextflow test
# This workflow is triggered on pushes and PRs to the repository.
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
docker:
runs-on: ubuntu-latest
strategy:
matrix:
nxf_ver: ['21.04.1', '']
steps:
- uses: actions/checkout@v2.3.4
- name: Install Nextflow
run: |
export NXF_VER=${{ matrix.nxf_ver }}
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
- name: Basic workflow tests
run: |
nextflow run ${GITHUB_WORKSPACE} -profile docker --fastq "test/data/tiny_{1,2}.*" \
--reference "test/data/tiny_reference.fasta" --max_cpus 2 --max_memory 4.GB \
--abyss false --gatb_minia false --idba false --metahipmer2 false \
--minia false --megahit false --metaspades false --spades false --unicycler false \
--velvetoptimiser false
FILE=report/index.html
if [ ! -f "$FILE" ]; then echo "Run failed!"; exit 1; else echo "Run successful!"; fi

singularity:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
singularity_version: ['3.6.4']
nxf_ver: ['21.04.1', '']
steps:
- uses: actions/checkout@v1
- uses: eWaterCycle/setup-singularity@v6
with:
singularity-version: ${{ matrix.singularity_version }}
- name: Install Nextflow
run: |
export NXF_VER=${{ matrix.nxf_ver }}
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
- name: Basic workflow tests
run: |
nextflow run ${GITHUB_WORKSPACE} -profile singularity --fastq "test/data/tiny_{1,2}.*" \
--reference "test/data/tiny_reference.fasta" --max_cpus 2 --max_memory 4.GB \
--abyss false --gatb_minia false --idba false --metahipmer2 false \
--minia false --megahit false --metaspades false --spades false --unicycler false \
--velvetoptimiser false
FILE=report/index.html
if [ ! -f "$FILE" ]; then echo "Run failed!"; exit 1; else echo "Run successful!"; fi
29 changes: 29 additions & 0 deletions .github/workflows/ci_templates.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: CI - Python templates test

on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ main ]
pull_request:
branches: [ main ]

workflow_dispatch:

jobs:
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
python-version: 3.8

- name: install dependencies
run: |
python -m pip install --upgrade pip
pip install -r docker/LMAS/requirements.txt
pip install pytest

- name: run pytest
run: pytest

39 changes: 0 additions & 39 deletions .github/workflows/main.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,6 @@ test/misassembly_test.json
test/misassembly_test_all.json
docs/resources/.DS_Store
.DS_Store
results/
report/
!modules/
14 changes: 14 additions & 0 deletions LMAS
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env bash

# This is a wrapper around LMAS-nf.
# By default `LMAS` will attempt to execute the main Nextflow pipeline.
# If no user input is provided, it prints the help message

# If no user input, print usage
if [[ $# == 0 ]]; then
nextflow run main.nf --help
exit
fi

# Run the pipeline
nextflow run main.nf $@
Loading