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

[RELEASE PR for 2.3.0 release] #305

Merged
merged 258 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
258 commits
Select commit Hold shift + click to select a range
ddb3dba
ADD SAMTOOLS SORT CONFIG
CKComputomics Jun 15, 2022
b2ef66a
FIX TYPO
CKComputomics Jun 15, 2022
29ec7da
ADD DEDUP DOCUMENTATION
CKComputomics Jun 15, 2022
afa1ad7
ADD DEDUP STEP
CKComputomics Jun 15, 2022
c72ac5b
ADD UMITOOLS VERSION
CKComputomics Jun 15, 2022
f442289
MERGE DEDUPLICATED AND UNMAPPED READS AFTER DEDUPLICATION
CKComputomics Jun 20, 2022
f9ca542
ADD MISSING OPTION
CKComputomics Jun 20, 2022
b974717
ADD NEWLINE
CKComputomics Jun 20, 2022
4610be1
CLEAN CODE
CKComputomics Jun 21, 2022
67b2cac
ADD DOCUMENTATION
CKComputomics Jun 21, 2022
23fc985
ADD UMI_MERGE_UNMAPPED COMMAND
CKComputomics Jun 21, 2022
be241ea
FINALIZE DOCUMENTATION
CKComputomics Jun 21, 2022
8b433f1
UPDATE MAIL TEMPLATE
CKComputomics Jun 21, 2022
0e732ed
CHANGE DAG OUTPUT TO HTML
CKComputomics Jun 21, 2022
8f426b5
PLEASE PRETTIER
CKComputomics Jun 21, 2022
8e132fb
Merge branch 'dev' into umitools
CKComputomics Jun 21, 2022
039843f
FIX MERGE ERROR
CKComputomics Jun 21, 2022
53c097c
MAKE PRETTIER HAPPY
CKComputomics Jun 21, 2022
608c414
ADD NF-CORE CAT
CKComputomics Jun 22, 2022
6d305c2
REPLACE CUSTOM CAT WITH NF-CORE CAT
CKComputomics Jun 22, 2022
57a8dba
REMOVE UNUSED MODULE
CKComputomics Jun 22, 2022
04b852c
Re-organized code mirna_quant to make it simpler to read
sguizard Oct 12, 2023
f285867
Switched to HTML less hairpin.fa and mature.fa
sguizard Oct 12, 2023
6948bad
detect bowtie2 idx instead of bowtie1 idx
sguizard Oct 16, 2023
16bb675
print mirQuant inputs
sguizard Oct 16, 2023
90527a2
debug mirdeeprun
sguizard Oct 16, 2023
39f0597
remove previous debug print
sguizard Oct 16, 2023
c198eda
add more debug messages
sguizard Oct 16, 2023
85cadb0
remove prints
sguizard Oct 16, 2023
7c703c9
remove metq from mature and hairpin
sguizard Oct 16, 2023
e8d04d2
connect clean hairpin / mature to mirdeep2
sguizard Oct 16, 2023
9285dfb
remove meta from fasta in mirdeep2_run
sguizard Oct 16, 2023
3a3f11b
Clean debug prints
sguizard Oct 16, 2023
357ca53
Merge branch 'debug' into fix-contamination_filter
sguizard Oct 16, 2023
c6efa86
update bowtie map contaminant with right options
sguizard Oct 17, 2023
0be5a17
define args variable
sguizard Oct 17, 2023
13fc7a4
FIx? - include fastqc trim to multiQC
sguizard Oct 17, 2023
71590db
Refresh pipeline summary
sguizard Oct 17, 2023
892ab89
Fix version: missing quotes and misaligned END_VER
sguizard Oct 17, 2023
05ae65a
Update doc with HTML less fa
sguizard Oct 17, 2023
e6a0b75
update mirtrace ouput directory
sguizard Oct 18, 2023
dd97948
update fastqc config
sguizard Oct 18, 2023
b59a73f
Update mirdeep2 publish_dir path
sguizard Oct 18, 2023
cdeb10c
BUmp dev
apeltzer Nov 3, 2023
f2541d2
Merge pull request #297 from nf-core/bump-dev
apeltzer Nov 9, 2023
c835f59
Fix stats not executed from genome
fhausmann Nov 28, 2023
7278013
Template update for nf-core/tools version 2.11
nf-core-bot Dec 19, 2023
ec3d446
Template update for nf-core/tools version 2.11.1
nf-core-bot Dec 20, 2023
fcc3ef0
Merge branch 'umi-handling' into umitools
apeltzer Jan 11, 2024
069beb1
Merge pull request #164 from CKComputomics/umitools
apeltzer Jan 11, 2024
ce28d5a
First batch of updates to 2024
apeltzer Jan 11, 2024
fed23d1
Add missing modules / subworkflows
apeltzer Jan 11, 2024
be15900
Add issue to changelog
fhausmann Jan 11, 2024
1d4fd07
Bringing this to 2024
apeltzer Jan 11, 2024
ba4479c
Merge branch 'umi-handling' into nf-core-template-merge-2.11.1
apeltzer Jan 11, 2024
285cfd0
Fixing linting errors
apeltzer Jan 11, 2024
cd69374
Merge pull request #302 from nf-core/nf-core-template-merge-2.11.1
apeltzer Jan 11, 2024
e1b232f
Follow the lead, Timmy
apeltzer Jan 11, 2024
2828bd2
Improvements to channel handling
apeltzer Jan 11, 2024
1be106c
Merge branch 'umi-handling' into fix_samtools_stats_genome
apeltzer Jan 11, 2024
b59bb7a
Merge pull request #300 from fhausmann/fix_samtools_stats_genome
apeltzer Jan 11, 2024
ff703f1
Update to latest subworkflow version
apeltzer Jan 12, 2024
313e7d3
Cleaning up
apeltzer Jan 12, 2024
5e3f082
Some more fixes / cleanup
apeltzer Jan 12, 2024
6240ec0
Clean
apeltzer Jan 12, 2024
bfcf486
Improved error handling
apeltzer Jan 12, 2024
d5d1bfc
Update nextflow_schema.json
apeltzer Jan 12, 2024
e331ac3
Merge remote-tracking branch 'upstream/fix-mirdeep2_and_contamination…
apeltzer Jan 12, 2024
22f07de
Fix for UMI fasta
apeltzer Jan 12, 2024
8fb0ae0
Fix params.fasta
apeltzer Jan 12, 2024
227af28
Minor updates
apeltzer Jan 12, 2024
eed0895
Fixing some lint warnings
apeltzer Jan 12, 2024
2cc2a0d
Adding in versions for filter stats
apeltzer Jan 12, 2024
bf6e8bd
Fixing more conda imports
apeltzer Jan 12, 2024
454504d
More updates of modules
apeltzer Jan 12, 2024
7eefcca
Fix
apeltzer Jan 12, 2024
f118456
Fix
apeltzer Jan 12, 2024
cbbc6d8
Another fix
apeltzer Jan 12, 2024
ea6d05e
Yeah fasta
apeltzer Jan 12, 2024
6df081f
Another one in the umi workflow
apeltzer Jan 12, 2024
43d3aba
Update edger_qc
apeltzer Jan 12, 2024
2059ed4
Shorten test.config
apeltzer Jan 17, 2024
945c318
Adding in UMI tests
apeltzer Jan 17, 2024
e43e4cf
Addressing some reviews
apeltzer Jan 17, 2024
3b21fe1
Add UMI regex
apeltzer Jan 17, 2024
8e21df8
Some more adjustments to make nf-core modules work
apeltzer Jan 17, 2024
fc01195
Fix meta2
apeltzer Jan 17, 2024
1410923
Passing on meta2
apeltzer Jan 17, 2024
12be186
use the channels, luke
apeltzer Jan 17, 2024
96adf13
Add better changelog with deps
apeltzer Jan 17, 2024
5c7227a
Add updated modules
apeltzer Jan 17, 2024
8d19dbf
Add updated modules.json
apeltzer Jan 17, 2024
84da917
Fixing the error :)
apeltzer Jan 17, 2024
e95f075
[automated] Fix linting with Prettier
nf-core-bot Jan 18, 2024
c51f54d
This should fix umitools extract
apeltzer Jan 18, 2024
3776e18
Improve more modules
apeltzer Jan 18, 2024
a5daf6b
Less lines
apeltzer Jan 18, 2024
4baf752
Apply suggestions from code review
apeltzer Jan 18, 2024
533a0f3
Fix input cardinality
grst Jan 18, 2024
60052b6
Compute index only once
grst Jan 18, 2024
f04ef2e
Check that fasta is provided when UMIs are used
grst Jan 18, 2024
41bd0d0
Acually use deduplicated reads
grst Jan 18, 2024
6213f5f
Use contaminant-filtered reads downstream
grst Jan 18, 2024
ed8ad08
Ensure fasta is optional
grst Jan 18, 2024
ed99b7e
Attempt to disable umi_stats on CI
grst Jan 18, 2024
1c278fe
increase limits for umitools dedup
grst Jan 19, 2024
91e67f2
Adding in possibiltiy to use different method for UMI grouping
apeltzer Jan 22, 2024
cfac917
Install umicollapse instead of umitools dedup
grst Jan 22, 2024
b9208ea
Switch to umicollapse
grst Jan 22, 2024
65f7f0e
Switch to umicollapse
grst Jan 22, 2024
8243651
[automated] Fix linting with Prettier
nf-core-bot Jan 22, 2024
ea68c8e
Don't merge deduplicated fastqs with unmapped fastqs
grst Jan 22, 2024
d493ff7
Try to set heap size
grst Jan 22, 2024
6fe6629
cast heap size to int
grst Jan 22, 2024
58c5b1a
Increase java stack size
grst Jan 23, 2024
53c6ffa
Set jvm options via JAVA_TOOL_OPTIONS
grst Jan 23, 2024
d5192d4
Full manual mode
grst Jan 23, 2024
3d8219e
Use two-pass mode for umicollapse
grst Jan 23, 2024
4fb2523
Increase stack size even further
grst Jan 23, 2024
2dd1e24
Updated umicollapse to modules provided version :)
apeltzer Jan 24, 2024
0f3aff3
Merge pull request #303 from nf-core/umi-handling
apeltzer Jan 24, 2024
c38c065
Bump versions to 2.3.0
apeltzer Jan 24, 2024
3a4a52d
And add changelog
apeltzer Jan 24, 2024
f9591e5
Merge pull request #304 from nf-core/bump-release-pr
grst Jan 24, 2024
521de8b
Bump the modules one last time
apeltzer Jan 25, 2024
d37495b
Merge pull request #306 from nf-core/bump-modules-last-time
apeltzer Jan 25, 2024
7cd043f
Update nextflow.config
apeltzer Jan 25, 2024
4b2bf89
Remove redundant fastq option
grst Jan 26, 2024
17f2ae5
Clean up config
grst Jan 26, 2024
306cd4e
WIP reorganize config
grst Jan 26, 2024
ede1ee9
More config updates
grst Jan 26, 2024
e707e28
Final outputpath fixes
grst Jan 26, 2024
a001dbf
Include MultiQC report for deduplicated fastqs
grst Jan 26, 2024
ec22f39
Update CHANGELOG
grst Jan 26, 2024
7409e09
Make sure multiqc can be generated when there's no UMI fastqc report
grst Jan 26, 2024
8dbd139
[automated] Fix linting with Prettier
nf-core-bot Jan 26, 2024
6d85ddf
Merge pull request #307 from nf-core/grst-fixes
apeltzer Jan 26, 2024
8121dec
Merge pull request #308 from nf-core/more-fastqc
apeltzer Jan 26, 2024
3097d17
Template update for nf-core/tools version 2.12
nf-core-bot Jan 29, 2024
cd0cecb
Merge branch 'dev' into nf-core-template-merge-2.12
apeltzer Jan 30, 2024
bdbf992
Remove padding
apeltzer Jan 30, 2024
ab9157e
Updates
apeltzer Jan 30, 2024
27ca21b
Lets see
apeltzer Jan 30, 2024
79b44f6
Exclude mirna adapters from lint test
apeltzer Jan 30, 2024
6409c7c
Merge pull request #309 from nf-core/nf-core-template-merge-2.12
apeltzer Jan 30, 2024
9266535
Changelog++, umicollapse update
apeltzer Jan 30, 2024
8e73796
Cleaning up UMI dedp to fastq based
apeltzer Jan 30, 2024
7c46a1e
Channel magic
apeltzer Jan 30, 2024
7aba903
Fix MultiQC
apeltzer Jan 30, 2024
c462d07
Getting more stuff in
apeltzer Jan 30, 2024
0d6ffad
Cleaned up modules.config
apeltzer Jan 30, 2024
da619d5
Small modifications to make mirtrace run again
apeltzer Jan 30, 2024
c5b9685
Add versions
apeltzer Jan 30, 2024
9fc7d0a
Yes, i wrote some docs
apeltzer Jan 30, 2024
7bf9266
Some more docs
apeltzer Jan 30, 2024
f5f17fd
Update umicollapse
apeltzer Jan 30, 2024
12980f8
Less warnings
apeltzer Jan 30, 2024
9cdb1c8
aDJUST
apeltzer Jan 30, 2024
cebd369
Merge pull request #310 from nf-core/fix-umidedup-fastq
apeltzer Jan 30, 2024
7515e60
Fix the stacksize
apeltzer Jan 30, 2024
55bfd6d
Use the pipe Luke
apeltzer Jan 31, 2024
ba2c5a8
mirtrace back
apeltzer Jan 31, 2024
b8fb3cb
Bugfix
apeltzer Jan 31, 2024
422b8ff
fastq mode, we need to not extract the UMIs
apeltzer Jan 31, 2024
38a4255
Adjusted to run umiextract after umicollapse
apeltzer Jan 31, 2024
3b646d6
Removed miRNA sequencing adapters due to new mode of data handling
apeltzer Jan 31, 2024
e64ea1c
Fix wrong path
apeltzer Feb 1, 2024
9fd9109
Configuration
apeltzer Feb 1, 2024
e83b910
ANd modules update
apeltzer Feb 1, 2024
6f5c91b
UMI pattern was wrong
apeltzer Feb 1, 2024
2d7f5a9
add FASTP length filtering step after umi extract
christopher-mohr Feb 1, 2024
bab81fc
Merge remote-tracking branch 'refs/remotes/origin/fix-stack-size' int…
christopher-mohr Feb 1, 2024
8c1143d
fix module config name of FASTP process, add
christopher-mohr Feb 2, 2024
f83f0a5
change default parameter values of FASTP max
christopher-mohr Feb 2, 2024
18b6aa8
change FASTP module publish dir names
christopher-mohr Feb 2, 2024
59eea65
adapt default value of param fastp_max_length
christopher-mohr Feb 2, 2024
3ef02e7
Merge pull request #311 from nf-core/fix-stack-size
apeltzer Feb 5, 2024
5479ab0
fix badges
christopher-mohr Feb 5, 2024
bde0ea2
add sentence on three prime adapter default
christopher-mohr Feb 5, 2024
b6285a3
add CATS kit adapter sequence
christopher-mohr Feb 5, 2024
c50de92
update docs on UMI parameters
christopher-mohr Feb 5, 2024
ece665a
improve usage docs on UMI
christopher-mohr Feb 6, 2024
a24fdcd
change parameter name to skip first umi extraction
christopher-mohr Feb 6, 2024
7af55aa
adapt pipeline overview to recent changes
christopher-mohr Feb 6, 2024
0c7400f
add parameter to save aligned read optionally,
christopher-mohr Feb 8, 2024
9b19940
do not store aligned reads for test
christopher-mohr Feb 8, 2024
3faa16c
set save_merged to false for test profile
christopher-mohr Feb 9, 2024
598af94
add parameter for specifying whether to save
christopher-mohr Feb 9, 2024
7d0a749
do not store aligned reads from mirna quant
christopher-mohr Feb 9, 2024
4791cf9
Merge pull request #314 from christopher-mohr/save_intermediate_optional
apeltzer Feb 9, 2024
e350db3
Merge branch 'dev' into update_docs
apeltzer Feb 9, 2024
ab69e97
update CHANGELOG
christopher-mohr Feb 9, 2024
7ffb437
schema help text, formatting
christopher-mohr Feb 9, 2024
18ae224
Merge pull request #313 from christopher-mohr/update_docs
christopher-mohr Feb 9, 2024
e35ff85
add check if mirgene_db_species is set if mirgene_db
christopher-mohr Feb 14, 2024
ab52f26
Upgrade modules accordingly
apeltzer Feb 14, 2024
c0293f1
Cleanup docker config
apeltzer Feb 15, 2024
7523865
Tiny update on modules to make tests pass
apeltzer Feb 15, 2024
2703dfa
Add tests clean
apeltzer Feb 15, 2024
607796b
Try to clean up first
apeltzer Feb 15, 2024
cbee5e7
Science
apeltzer Feb 15, 2024
6ea0aad
Merge pull request #316 from nf-core/bump-modules
apeltzer Feb 15, 2024
84c42d4
fix index ref and fasta init
christopher-mohr Feb 16, 2024
f37d672
Merge branch 'dev' into fix_bowtie_index_issue
christopher-mohr Feb 16, 2024
0adca31
Merge pull request #315 from christopher-mohr/add_mirgenedb_species_c…
apeltzer Feb 16, 2024
14e08c1
revert fasta channel change
christopher-mohr Feb 16, 2024
0bf058a
use main smrnaseq test data branch for test
christopher-mohr Feb 16, 2024
fff1365
add test profile for testing provided bowtie index
christopher-mohr Feb 16, 2024
c951cc1
add new test profile to config
christopher-mohr Feb 16, 2024
0074162
replace index variable
christopher-mohr Feb 16, 2024
134d266
initialize fasta channel depending on bowtie_index
christopher-mohr Feb 19, 2024
a22b41b
Template update for nf-core/tools version 2.13
nf-core-bot Feb 20, 2024
b27b98b
add functionality to process archived bowtie index
christopher-mohr Feb 21, 2024
6e5888c
adjust test config with bowtie index
christopher-mohr Feb 21, 2024
bf78343
fix syntax error
christopher-mohr Feb 21, 2024
70db681
First stab at 2.13
apeltzer Feb 21, 2024
318e05e
Remove leftover CI cleanup
apeltzer Feb 21, 2024
7082993
Adjust function calls
apeltzer Feb 21, 2024
e62e45c
Use paramsSummaryMultiqc function
apeltzer Feb 21, 2024
ac77ee9
Modifications to main workflow and root workflow definition
apeltzer Feb 21, 2024
f21a7d5
Remove duplicated config entries
apeltzer Feb 21, 2024
fcd224e
Clean up
apeltzer Feb 21, 2024
dd24d5f
Add back config defaults
apeltzer Feb 21, 2024
963f7d4
Clean up
apeltzer Feb 21, 2024
cfd3e04
Moar cleaning
apeltzer Feb 21, 2024
c0e3302
Remove old import
apeltzer Feb 21, 2024
3045655
Cleaning up structure
apeltzer Feb 21, 2024
a72d664
Adhere to new structure
apeltzer Feb 21, 2024
db2787d
Cleaner
apeltzer Feb 21, 2024
60de7ca
Follow the lead
apeltzer Feb 21, 2024
f5044d2
Clean up imports
apeltzer Feb 21, 2024
6230447
Order!
apeltzer Feb 21, 2024
a208112
Add checks back in
apeltzer Feb 21, 2024
e1778fa
Guess who's back, back again? YAMLs back, call a friend.
apeltzer Feb 21, 2024
e782767
Adjust modules config to new structure
apeltzer Feb 21, 2024
ff34b0f
Add default bowtie_index = null
apeltzer Feb 21, 2024
ad7af7a
Merge pull request #317 from christopher-mohr/fix_bowtie_index_issue
apeltzer Feb 21, 2024
a7ddbe2
Merge remote-tracking branch 'origin/dev' into nf-core-template-merge…
apeltzer Feb 22, 2024
7bd08bd
Added back softwareVresionsYaml
apeltzer Feb 22, 2024
c5e8393
Fix thanks to arthur and mahesh
apeltzer Feb 22, 2024
e0ad3fb
Merge pull request #318 from nf-core/nf-core-template-merge-2.13
apeltzer Feb 22, 2024
761b71c
Add proper changelog updates
apeltzer Feb 22, 2024
f7f6331
Add proper changelog updates
apeltzer Feb 22, 2024
734ce7f
Fix image
apeltzer Feb 22, 2024
9193a5c
Fix modules
apeltzer Feb 22, 2024
b041d83
Fix lint
apeltzer Feb 22, 2024
f923057
Update CHANGELOG.md
apeltzer Feb 23, 2024
472a647
Add back changelog stuf
apeltzer Feb 23, 2024
abd6774
Merge branch 'dev' of https://github.com/nf-core/smrnaseq into dev
apeltzer Feb 23, 2024
969e335
Remove todo
apeltzer Feb 23, 2024
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
15 changes: 14 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,20 @@ end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset
[/subworkflows/nf-core/**]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset

[/assets/email*]
indent_size = unset

# ignore Readme
[README.md]
indent_style = unset

# ignore python
[*.{py,md}]
indent_style = unset
3 changes: 3 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ If you're not used to this workflow with git, you can start with some [docs from

## Tests

You can optionally test your changes by running the pipeline locally. Then it is recommended to use the `debug` profile to
receive warnings about process selectors and other debug info. Example: `nextflow run . -profile debug,test,docker --outdir <OUTDIR>`.

When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.

Expand Down
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/smrn
- [ ] If necessary, also make a PR on the nf-core/smrnaseq _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core lint`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
- [ ] Output Documentation in `docs/output.md` is updated.
- [ ] `CHANGELOG.md` is updated.
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
uses: seqeralabs/action-tower-launch@v2
uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2
# Add full size test data (but still relatively small datasets for few samples)
# on the `test_full.config` test runs with only one set of parameters
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
Expand All @@ -28,7 +30,7 @@ jobs:
}
profiles: test_full

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
with:
name: Tower debug log file
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
# Launch workflow using Tower CLI tool action
- name: Launch workflow via tower
uses: seqeralabs/action-tower-launch@v2
uses: seqeralabs/action-tower-launch@922e5c8d5ac4e918107ec311d2ebbd65e5982b3d # v2
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
Expand All @@ -25,7 +25,7 @@ jobs:
}
profiles: test

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
with:
name: Tower debug log file
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
with:
message: |
## This PR is against the `master` branch :x:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,20 @@ jobs:
profile:
- "test"
- "test_no_genome"
- "test_umi"
- "test_index"
steps:
- name: Check out pipeline code
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
with:
version: "${{ matrix.NXF_VER }}"

- name: Disk space cleanup
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1

- name: Run pipeline with test data
run: |
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.profile }},docker --outdir ./results
2 changes: 1 addition & 1 deletion .github/workflows/clean-up.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v7
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
with:
stale-issue-message: "This issue has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment otherwise this issue will be closed in 20 days."
stale-pr-message: "This PR has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment if it is still useful."
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/download_pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Test successful pipeline download with 'nf-core download'

# Run the workflow when:
# - dispatched manually
# - when a PR is opened or reopened to master branch
# - the head branch of the pull request is updated, i.e. if fixes for a release are pushed last minute to dev.
on:
workflow_dispatch:
inputs:
testbranch:
description: "The specific branch you wish to utilize for the test execution of nf-core download."
required: true
default: "dev"
pull_request:
types:
- opened
branches:
- master
pull_request_target:
branches:
- master

env:
NXF_ANSI_LOG: false

jobs:
download:
runs-on: ubuntu-latest
steps:
- name: Install Nextflow
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1

- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
with:
python-version: "3.11"
architecture: "x64"
- uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7
with:
singularity-version: 3.8.3

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install git+https://github.com/nf-core/tools.git@dev

- name: Get the repository name and current branch set as environment variable
run: |
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV}

- name: Download the pipeline
env:
NXF_SINGULARITY_CACHEDIR: ./
run: |
nf-core download ${{ env.REPO_LOWERCASE }} \
--revision ${{ env.REPO_BRANCH }} \
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
--compress "none" \
--container-system 'singularity' \
--container-library "quay.io" -l "docker.io" -l "ghcr.io" \
--container-cache-utilisation 'amend' \
--download-configuration

- name: Inspect download
run: tree ./${{ env.REPOTITLE_LOWERCASE }}

- name: Run the downloaded pipeline
env:
NXF_SINGULARITY_CACHEDIR: ./
NXF_SINGULARITY_HOME_MOUNT: true
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
72 changes: 53 additions & 19 deletions .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [created]

jobs:
deploy:
fix-linting:
# Only run if comment is on a PR with the main repo, and if it contains the magic keywords
if: >
contains(github.event.comment.html_url, '/pull/') &&
Expand All @@ -13,43 +13,77 @@ jobs:
runs-on: ubuntu-latest
steps:
# Use the @nf-core-bot token to check out so we can push later
- uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
with:
token: ${{ secrets.nf_core_bot_auth_token }}

# indication that the linting is being fixed
- name: React on comment
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
comment-id: ${{ github.event.comment.id }}
reactions: eyes

# Action runs on the issue comment, so we don't get the PR by default
# Use the gh cli to check out the PR
- name: Checkout Pull Request
run: gh pr checkout ${{ github.event.issue.number }}
env:
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}

- uses: actions/setup-node@v3
# Install and run pre-commit
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
with:
python-version: 3.11

- name: Install Prettier
run: npm install -g prettier @prettier/plugin-php
- name: Install pre-commit
run: pip install pre-commit

# Check that we actually need to fix something
- name: Run 'prettier --check'
id: prettier_status
run: |
if prettier --check ${GITHUB_WORKSPACE}; then
echo "result=pass" >> $GITHUB_OUTPUT
else
echo "result=fail" >> $GITHUB_OUTPUT
fi
- name: Run pre-commit
id: pre-commit
run: pre-commit run --all-files
continue-on-error: true

- name: Run 'prettier --write'
if: steps.prettier_status.outputs.result == 'fail'
run: prettier --write ${GITHUB_WORKSPACE}
# indication that the linting has finished
- name: react if linting finished succesfully
if: steps.pre-commit.outcome == 'success'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
comment-id: ${{ github.event.comment.id }}
reactions: "+1"

- name: Commit & push changes
if: steps.prettier_status.outputs.result == 'fail'
id: commit-and-push
if: steps.pre-commit.outcome == 'failure'
run: |
git config user.email "[email protected]"
git config user.name "nf-core-bot"
git config push.default upstream
git add .
git status
git commit -m "[automated] Fix linting with Prettier"
git commit -m "[automated] Fix code linting"
git push

- name: react if linting errors were fixed
id: react-if-fixed
if: steps.commit-and-push.outcome == 'success'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
comment-id: ${{ github.event.comment.id }}
reactions: hooray

- name: react if linting errors were not fixed
if: steps.commit-and-push.outcome == 'failure'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
comment-id: ${{ github.event.comment.id }}
reactions: confused

- name: react if linting errors were not fixed
if: steps.commit-and-push.outcome == 'failure'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
with:
issue-number: ${{ github.event.issue.number }}
body: |
@${{ github.actor }} I tried to fix the linting errors, but it didn't work. Please fix them manually.
See [CI log](https://github.com/nf-core/smrnaseq/actions/runs/${{ github.run_id }}) for more details.
67 changes: 14 additions & 53 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,72 +11,33 @@ on:
types: [published]

jobs:
EditorConfig:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- uses: actions/setup-node@v3

- name: Install editorconfig-checker
run: npm install -g editorconfig-checker

- name: Run ECLint check
run: editorconfig-checker -exclude README.md $(find .* -type f | grep -v '.git\|.py\|.md\|json\|yml\|yaml\|html\|css\|work\|.nextflow\|build\|nf_core.egg-info\|log.txt\|Makefile')

Prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3

- name: Install Prettier
run: npm install -g prettier

- name: Run Prettier --check
run: prettier --check ${GITHUB_WORKSPACE}

PythonBlack:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Check code lints with Black
uses: psf/black@stable

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
- name: Set up Python 3.11
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
with:
message: |
## Python linting (`black`) is failing

To keep the code consistent with lots of contributors, we run automated code consistency checks.
To fix this CI test, please run:

* Install [`black`](https://black.readthedocs.io/en/stable/): `pip install black`
* Fix formatting errors in your pipeline: `black .`

Once you push these changes the test should pass, and you can hide this comment :+1:
python-version: 3.11
cache: "pip"

We highly recommend setting up Black in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!
- name: Install pre-commit
run: pip install pre-commit

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false
- name: Run pre-commit
run: pre-commit run --all-files

nf-core:
runs-on: ubuntu-latest
steps:
- name: Check out pipeline code
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1

- uses: actions/setup-python@v4
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
with:
python-version: "3.11"
architecture: "x64"
Expand All @@ -99,7 +60,7 @@ jobs:

- name: Upload linting log file artifact
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
with:
name: linting-logs
path: |
Expand Down
Loading
Loading