Skip to content

Commit 42c9d5f

Browse files
authored
Merge pull request #911 from nf-core/dev
Patch release 2.4.5
2 parents e582655 + 274d8c0 commit 42c9d5f

18 files changed

Lines changed: 329 additions & 355 deletions

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
3838
- name: Build new docker image
3939
if: env.MATCHED_FILES
40-
run: docker build --no-cache . -t nfcore/eager:2.4.4
40+
run: docker build --no-cache . -t nfcore/eager:2.4.5
4141

4242
- name: Pull docker image
4343
if: ${{ !env.MATCHED_FILES }}
4444
run: |
4545
docker pull nfcore/eager:dev
46-
docker tag nfcore/eager:dev nfcore/eager:2.4.4
46+
docker tag nfcore/eager:dev nfcore/eager:2.4.5
4747
4848
- name: Install Nextflow
4949
env:

.github/workflows/linting.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v2
15-
- uses: actions/setup-node@v1
16-
with:
17-
node-version: '10'
15+
- uses: actions/setup-node@v2
16+
1817
- name: Install markdownlint
1918
run: npm install -g markdownlint-cli
2019
- name: Run Markdownlint
@@ -46,18 +45,16 @@ jobs:
4645
repo-token: ${{ secrets.GITHUB_TOKEN }}
4746
allow-repeats: false
4847

49-
5048
YAML:
5149
runs-on: ubuntu-latest
5250
steps:
5351
- uses: actions/checkout@v1
54-
- uses: actions/setup-node@v1
55-
with:
56-
node-version: '10'
52+
- uses: actions/setup-node@v2
53+
5754
- name: Install yaml-lint
5855
run: npm install -g yaml-lint
5956
- name: Run yaml-lint
60-
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml")
57+
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml") -c .github/yamllint.yml
6158

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

87-
8884
nf-core:
8985
runs-on: ubuntu-latest
9086
steps:
91-
9287
- name: Check out pipeline code
9388
uses: actions/checkout@v2
9489

@@ -101,8 +96,8 @@ jobs:
10196
10297
- uses: actions/setup-python@v1
10398
with:
104-
python-version: '3.6'
105-
architecture: 'x64'
99+
python-version: "3.6"
100+
architecture: "x64"
106101

107102
- name: Install dependencies
108103
run: |
@@ -129,4 +124,3 @@ jobs:
129124
lint_log.txt
130125
lint_results.md
131126
PR_number.txt
132-

.github/yamllint.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
rules:
2+
document-start: disable
3+
comments: disable
4+
truthy: disable
5+
line-length: disable
6+
empty-lines: disable
7+

.gitpod.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
image: nfcore/gitpod:latest
2+
3+
vscode:
4+
extensions: # based on nf-core.nf-core-extensionpack
5+
- codezombiech.gitignore # Language support for .gitignore files
6+
# - cssho.vscode-svgviewer # SVG viewer
7+
- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
8+
- eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed
9+
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
10+
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
11+
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
12+
# - nextflow.nextflow # Nextflow syntax highlighting
13+
- oderwat.indent-rainbow # Highlight indentation level
14+
- streetsidesoftware.code-spell-checker # Spelling checker for source code

.nf-core-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ files_unchanged:
33
- .github/CONTRIBUTING.md
44
- .github/ISSUE_TEMPLATE/bug_report.md
55
- docs/README.md
6-
6+
- .github/workflows/linting.yml

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,32 @@
33
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
55

6+
## [2.4.5] - 2022-07-39
7+
8+
### `Added`
9+
10+
### `Fixed`
11+
12+
- [#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)
13+
- [#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)
14+
- [#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)
15+
- [#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)
16+
- [#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)
17+
- [#889](https://github.com/nf-core/eager/issues/889) Remove/update parameters from benchmarking test profiles (♥ to @TCLamnidis for reporting)
18+
- [#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)
19+
- [#897](https://github.com/nf-core/eager/issues/897) Fix pipeline crash if no Kraken2 results generated (♥ to @alexandregilardet for reporting)
20+
- [#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)
21+
- Fixed some missing default values in the nextflow parameter schema JSON
22+
- [#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)
23+
- Fix staging of input bams for genotyping_pileupcaller process. Downstream changes from changes introduced when fixing endorspy caching.
24+
- Made slight correction on metro map diagram regarding input data to SexDeterrmine (only BAM trimming output files)
25+
26+
### `Dependencies`
27+
28+
- Updated MultiQC to latest stable alpha version on bioconda, correcting the previously nonsensical AdapterRemoval plots (♥ to @NiemannJ for fixing in MultiQC)
29+
30+
### `Deprecated`
31+
632
## [2.4.4] - 2022-04-08
733

834
### `Added`

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ COPY environment.yml /
77
RUN conda env create --quiet -f /environment.yml && conda clean -a
88

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

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

0 commit comments

Comments
 (0)