Skip to content

Commit 6779efc

Browse files
authored
Merge branch 'dev' into endorspy-resume-fix
2 parents 93301b7 + f1e6be9 commit 6779efc

12 files changed

Lines changed: 209 additions & 291 deletions

.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+

.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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
### `Added`
99

10-
1110
### `Fixed`
1211

1312
- [#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)
@@ -19,10 +18,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1918
- [#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)
2019
- [#897](https://github.com/nf-core/eager/issues/897) Fix pipeline crash if no Kraken2 results generated (♥ to @alexandregilardet for reporting)
2120
- [#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)
2223
- Fix staging of input bams for genotyping_pileupcaller process. Downstream changes from changes introduced when fixing endorspy caching.
2324

2425
### `Dependencies`
2526

27+
- Updated MultiQC to latest stable alpha version on bioconda, correcting the previously nonsensical AdapterRemoval plots (♥ to @NiemannJ for fixing in MultiQC)
28+
2629
### `Deprecated`
2730

2831
## [2.4.4] - 2022-04-08

0 commit comments

Comments
 (0)