Skip to content
Merged
Show file tree
Hide file tree
Changes from 88 commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
6c605f3
Switch hostremoval_input_fastq from multiprocessing to multithreading…
maxibor Sep 6, 2021
6b7b0f4
switch fastq parsing to pysam
maxibor Sep 7, 2021
a4e9722
update log message
maxibor Sep 7, 2021
d4b3d31
speed and memory optimization
maxibor Oct 12, 2021
bfcf424
merge from upstream
maxibor Oct 12, 2021
36d9770
update changelog
maxibor Oct 12, 2021
ccbb173
add missing return character
maxibor Oct 12, 2021
8a9bbe1
define DSL1 explicitly, as Nextflow made DSL2 default
Lehmann-Fabian Apr 25, 2022
0411e51
Added information to Changelog.md
Lehmann-Fabian Apr 26, 2022
430a029
Update CHANGELOG.md
jfy133 Apr 26, 2022
3ad88ec
Update CHANGELOG.md
jfy133 Apr 26, 2022
98a9545
Merge pull request #882 from Lehmann-Fabian/dev
jfy133 Apr 26, 2022
d52002e
Fix raw FASTQC single-end threads
jfy133 Apr 26, 2022
44b115f
Update CHANGELOG.md
jfy133 Apr 26, 2022
bec759f
Update CHANGELOG.md
jfy133 Apr 26, 2022
7c14662
move fastq to pysam
maxibor Apr 29, 2022
889b7a0
Merge branch 'dev' of github.com:maxibor/eager into dev
maxibor Apr 29, 2022
5913b33
Merge pull request #883 from nf-core/fastqc-thread-fix
jfy133 May 5, 2022
314c51b
fix host_removal flags
maxibor May 23, 2022
4d7e1c0
Add memory to all java tools in get_software_versions
jfy133 May 30, 2022
1dcd882
Phrasing Tweak
jfy133 May 30, 2022
ebba956
Fix issue number in link
jfy133 May 30, 2022
a6c0787
Clarify clip_readlength help text for what is considered ultra-short …
jfy133 May 30, 2022
951433d
Remove deprecated params from benchmarking profiles
jfy133 May 30, 2022
d6cafa8
Changelog
jfy133 Jun 2, 2022
b974bf1
Relace bbduk version with bbversion.sh
jfy133 Jun 3, 2022
377f1ae
Typo fix and location output docs in pipeline summary
jfy133 Jun 13, 2022
204ca23
Allow no output from Kraken2 e.g. for negative controls with no reads
jfy133 Jul 1, 2022
898b643
Update CHANGELOG.md
jfy133 Jul 1, 2022
9086bad
Merge pull request #890 from nf-core/patch-getsoftwraeversions-java
jfy133 Jul 4, 2022
46fd156
Merge branch 'dev' into patch-improve_clipreadlength_desc
jfy133 Jul 4, 2022
e6efd0e
Update CHANGELOG.md
jfy133 Jul 4, 2022
398f9fb
Merge branch 'dev' into patch-testconfig_params_updates
jfy133 Jul 4, 2022
5b435e1
Merge branch 'dev' into output-docs-improvements
jfy133 Jul 4, 2022
99053b5
Merge branch 'dev' into kraken2-emptyfastq-fix
jfy133 Jul 4, 2022
d2dd49f
Merge pull request #891 from nf-core/patch-improve_clipreadlength_desc
jfy133 Jul 4, 2022
a58b829
Merge branch 'dev' into patch-testconfig_params_updates
jfy133 Jul 4, 2022
8d41bc9
Merge pull request #892 from nf-core/patch-testconfig_params_updates
jfy133 Jul 4, 2022
69f7bc2
Merge branch 'dev' into output-docs-improvements
jfy133 Jul 4, 2022
0cca15a
Merge pull request #896 from nf-core/output-docs-improvements
jfy133 Jul 4, 2022
634ae16
Merge branch 'dev' into kraken2-emptyfastq-fix
jfy133 Jul 4, 2022
881e85f
Update output.md
jfy133 Jul 8, 2022
c3c252d
Merge pull request #898 from nf-core/kraken2-emptyfastq-fix
jfy133 Jul 8, 2022
f12a85d
Fix circulargenerator assuming .fasta extension
jfy133 Jul 12, 2022
441b276
Add .gitpod.yml for remote working
jfy133 Jul 12, 2022
2807a17
Merge pull request #901 from nf-core/gitpod
jfy133 Jul 12, 2022
f5e85e3
Merge pull request #900 from nf-core/circularmapper-fix
jfy133 Jul 13, 2022
8ed89e4
Remove old dumps
jfy133 Jul 16, 2022
5168c12
Fix failed of endorspy to execute or cache on resume
jfy133 Jul 16, 2022
d36a043
Grammar
jfy133 Jul 16, 2022
1074713
Remove unused code
jfy133 Jul 16, 2022
d2418f6
Undo more debugging
jfy133 Jul 16, 2022
da0c068
Fix missing defaults
jfy133 Jul 16, 2022
e325b38
Update changelgo
jfy133 Jul 16, 2022
8271378
Merge pull request #903 from nf-core/defaults-fix
jfy133 Jul 18, 2022
aa6126b
Merge remote-tracking branch 'upstream/dev' into dev
maxibor Jul 20, 2022
5b8b7eb
threads is proc
maxibor Jul 20, 2022
d743711
remove return set
maxibor Jul 20, 2022
ab08264
update changelog
maxibor Jul 20, 2022
64ddf4e
Update CHANGELOG.md
jfy133 Jul 20, 2022
52a6300
Bump MultiQC so we get proper AR2 plots
jfy133 Jul 20, 2022
208132b
Merge pull request #907 from nf-core/multiqc-update
jfy133 Jul 21, 2022
0102395
Minor modification
jfy133 Jul 25, 2022
9108e8f
Merge pull request #905 from maxibor/dev
jfy133 Jul 26, 2022
feaa7a6
Merge pull request #908 from nf-core/tube-update
jfy133 Jul 27, 2022
b4b5859
Add path call in pileupcaller bams
TCLamnidis Jul 27, 2022
637cd73
fix pileupcaller path input. paths in bamtrim.
TCLamnidis Jul 28, 2022
4f19b50
Update CHANGELOG.md
TCLamnidis Jul 28, 2022
199a02b
Pin to later version of node as in https://github.com/nf-core/tools/p…
jfy133 Jul 29, 2022
2997adc
Update linting.yml
jfy133 Jul 29, 2022
c6ea117
Update .nf-core-lint.yml
jfy133 Jul 29, 2022
99046cb
prettier fixes
jfy133 Jul 29, 2022
f6ebee3
Fix markdown linting
jfy133 Jul 29, 2022
f5f805c
Revert nf-core non-standard linting files but still template
jfy133 Jul 29, 2022
cedb950
Revert "Revert nf-core non-standard linting files but still template"
jfy133 Jul 29, 2022
0a0b4b3
Revert "Fix markdown linting"
jfy133 Jul 29, 2022
687eb7f
Revert "prettier fixes"
jfy133 Jul 29, 2022
391489a
Fix markdown linting
jfy133 Jul 29, 2022
93301b7
Merge pull request #909 from nf-core/pileupcaller_paths_fix
jfy133 Jul 29, 2022
2ac8389
Final markdown linting
jfy133 Jul 29, 2022
260d780
Fix inconssitency with template
jfy133 Jul 29, 2022
0d7fbbf
Missing new line
jfy133 Jul 29, 2022
9b9173d
Try custom yaml linting
jfy133 Jul 29, 2022
a81503b
fix yaml lint config param
jfy133 Jul 29, 2022
f1e6be9
Merge pull request #910 from nf-core/linting-fixes
jfy133 Jul 29, 2022
6779efc
Merge branch 'dev' into endorspy-resume-fix
jfy133 Jul 29, 2022
4e93c55
Merge pull request #902 from nf-core/endorspy-resume-fix
jfy133 Jul 29, 2022
a79a691
Bump versions for release
jfy133 Jul 29, 2022
8a8eab5
Apply suggestions from code review
jfy133 Jul 31, 2022
274d8c0
Apply suggestions from code review
TCLamnidis Aug 2, 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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:

- name: Build new docker image
if: env.MATCHED_FILES
run: docker build --no-cache . -t nfcore/eager:2.4.4
run: docker build --no-cache . -t nfcore/eager:2.4.5

- name: Pull docker image
if: ${{ !env.MATCHED_FILES }}
run: |
docker pull nfcore/eager:dev
docker tag nfcore/eager:dev nfcore/eager:2.4.4
docker tag nfcore/eager:dev nfcore/eager:2.4.5

- name: Install Nextflow
env:
Expand Down
20 changes: 7 additions & 13 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '10'
- uses: actions/setup-node@v2

- name: Install markdownlint
run: npm install -g markdownlint-cli
- name: Run Markdownlint
Expand Down Expand Up @@ -46,18 +45,16 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false


YAML:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: '10'
- uses: actions/setup-node@v2

- name: Install yaml-lint
run: npm install -g yaml-lint
- name: Run yaml-lint
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml")
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml") -c .github/yamllint.yml

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
Expand All @@ -84,11 +81,9 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false


nf-core:
runs-on: ubuntu-latest
steps:

- name: Check out pipeline code
uses: actions/checkout@v2

Expand All @@ -101,8 +96,8 @@ jobs:

- uses: actions/setup-python@v1
with:
python-version: '3.6'
architecture: 'x64'
python-version: "3.6"
architecture: "x64"

- name: Install dependencies
run: |
Expand All @@ -129,4 +124,3 @@ jobs:
lint_log.txt
lint_results.md
PR_number.txt

7 changes: 7 additions & 0 deletions .github/yamllint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
rules:
document-start: disable
comments: disable
truthy: disable
line-length: disable
empty-lines: disable

14 changes: 14 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
image: nfcore/gitpod:latest

vscode:
extensions: # based on nf-core.nf-core-extensionpack
- codezombiech.gitignore # Language support for .gitignore files
# - cssho.vscode-svgviewer # SVG viewer
- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
- eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
# - nextflow.nextflow # Nextflow syntax highlighting
- oderwat.indent-rainbow # Highlight indentation level
- streetsidesoftware.code-spell-checker # Spelling checker for source code
2 changes: 1 addition & 1 deletion .nf-core-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ files_unchanged:
- .github/CONTRIBUTING.md
- .github/ISSUE_TEMPLATE/bug_report.md
- docs/README.md

- .github/workflows/linting.yml
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,31 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2.4.5] - 2022-07-39

### `Added`

### `Fixed`

- [#882](https://github.com/nf-core/eager/pull/882) Define DSL1 execution explicitly, as new versions Nextflow made DSL2 default (♥ to & fix from @Lehmann-Fabian)
- [#879](https://github.com/nf-core/eager/issues/879) Add missing threads parameter for pre-clipping FastQC for single end data that caused insufficient memory in some cases (♥ to @marcel-keller for reporting)
- [#880](https://github.com/nf-core/eager/issues/880) Fix failure of endorSpy to be cached or reexecuted on resume (♥ to @KathrinNaegele, @TCLamnidis, & @mahesh-panchal for reporting and debugging)
- [#885](https://github.com/nf-core/eager/issues/885) Specify task memory for all tools in get_software_versions to account for incompatibilty of java with some SGE clusters causing hanging of the process (♥ to @maxibor for reporting)
- [#887](https://github.com/nf-core/eager/issues/887) Clarify what is considered 'ultra-short' reads in the help text of clip_readlength, for when you may wish to turn of length filtering during AdapterRemoval (♥ to @TCLamnidis for reporting)
- [#889](https://github.com/nf-core/eager/issues/889) Remove/updated parameters from benchmarking test profiles (♥ to @TCLamnidis for reporting)
Comment thread
TCLamnidis marked this conversation as resolved.
Outdated
- [#895](https://github.com/nf-core/eager/issues/895) Output documentation typo fix and added location of output docs in pipeline summary (♥ to @RodrigoBarquera for reporting)
- [#897](https://github.com/nf-core/eager/issues/897) Fix pipeline crash if no Kraken2 results generated (♥ to @alexandregilardet for reporting)
- [#899](https://github.com/nf-core/eager/issues/897) Fix pipeline crash for circulargenerator if reference file does not end in .fasta (♥ to @scarlhoff for reporting)
- Fixed some missing default values in the nextflow parameter schema JSON
- [#789](https://github.com/nf-core/eager/issues/789) Substantial speed and memory optimisation of the `extract_map_reads.py` script (♥ to @ivelsko for reporting, @maxibor for optimisation)
- Fix staging of input bams for genotyping_pileupcaller process. Downstream changes from changes introduced when fixing endorspy caching.

Comment thread
TCLamnidis marked this conversation as resolved.
Comment thread
jfy133 marked this conversation as resolved.
### `Dependencies`

- Updated MultiQC to latest stable alpha version on bioconda, correcting the previously nonsensical AdapterRemoval plots (♥ to @NiemannJ for fixing in MultiQC)

### `Deprecated`

## [2.4.4] - 2022-04-08

### `Added`
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY environment.yml /
RUN conda env create --quiet -f /environment.yml && conda clean -a

# Add conda installation dir to PATH (instead of doing 'conda activate')
ENV PATH /opt/conda/envs/nf-core-eager-2.4.4/bin:$PATH
ENV PATH /opt/conda/envs/nf-core-eager-2.4.5/bin:$PATH

# Dump the details of the installed packages to a file for posterity
RUN conda env export --name nf-core-eager-2.4.4 > nf-core-eager-2.4.4.yml
RUN conda env export --name nf-core-eager-2.4.5 > nf-core-eager-2.4.5.yml
Loading