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