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

Dev -> Master for v2.0.0 release #293

Merged
merged 617 commits into from
Oct 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
617 commits
Select commit Hold shift + click to select a range
bcd1213
Fix merge conflicts
drpatelh Mar 2, 2022
bfc515e
Fix YAMLLint in pipeline
drpatelh Mar 2, 2022
755cc32
Fix nf-core linting
drpatelh Mar 2, 2022
ad0671a
Merge pull request #256 from drpatelh/template_dev
drpatelh Mar 3, 2022
717e09d
Merge branch 'dev' of https://github.com/nf-core/chipseq into updates
drpatelh Mar 3, 2022
4bb1c93
Reformat chr ids from mm10 to GRCm38
JoseEspinosa Mar 3, 2022
9965100
Reformat v3 blacklist from hg38 to GRCh38
JoseEspinosa Mar 3, 2022
1b431ae
Keep the manual annotated blacklist files
JoseEspinosa Mar 3, 2022
30d0d68
Update igenomes with the new or reallocated blacklist files
JoseEspinosa Mar 3, 2022
c209480
Update changelog
JoseEspinosa Mar 3, 2022
7bac1de
Add again the logic for using blacklist bed files
JoseEspinosa Mar 3, 2022
936d3a8
Remove v1 bed files from mouse
JoseEspinosa Mar 3, 2022
649d587
Update usage with the references to the blacklist files
JoseEspinosa Mar 3, 2022
e417d3e
Add the blacklist file to filter_bam_bamtools subworkflow
JoseEspinosa Mar 3, 2022
7307d98
Make markdown lint happy again
JoseEspinosa Mar 3, 2022
904a52b
Merge pull request #257 from JoseEspinosa/blacklist_v2
drpatelh Mar 5, 2022
98eaca6
Update modules and small fixes due to update
JoseEspinosa Mar 5, 2022
8857b01
Merge pull request #258 from JoseEspinosa/update_modules
drpatelh Mar 6, 2022
e912404
Make --outdir mandatory
JoseEspinosa Mar 7, 2022
3cab81d
Delete deprecated blacklist files
JoseEspinosa Mar 7, 2022
ea0ad89
Make nf-core lint happy
JoseEspinosa Mar 7, 2022
d2b06f0
Merge pull request #259 from JoseEspinosa/outdir_mandatory
drpatelh Mar 7, 2022
10573c6
Template update for nf-core/tools version 2.3
nf-core-bot Mar 15, 2022
7e51da1
Merge branch 'TEMPLATE' of https://github.com/nf-core/chipseq into me…
JoseEspinosa Mar 22, 2022
b021695
Update changelog
JoseEspinosa Mar 22, 2022
0f2accb
Fix lint and get rid of some merge tags that were remaining
JoseEspinosa Mar 22, 2022
441e917
Fix yamllint
JoseEspinosa Mar 22, 2022
a8d1443
Merge pull request #262 from JoseEspinosa/merging-template-updates-2.3
drpatelh Mar 22, 2022
dc3a8c0
Template update for nf-core/tools version 2.3.1
nf-core-bot Mar 23, 2022
d9f7f50
Template update for nf-core/tools version 2.3.2
nf-core-bot Mar 24, 2022
8b1c3e3
Merge branch 'TEMPLATE' of https://github.com/nf-core/chipseq into me…
JoseEspinosa Mar 28, 2022
8716968
Update nf-core.yml
JoseEspinosa Mar 28, 2022
b3f5634
Merge branch 'dev' into merging-template-updates-2.3.2
JoseEspinosa Mar 28, 2022
b8e36c0
Fix nf-core lint
JoseEspinosa Mar 28, 2022
b12a829
Make happy prettier
JoseEspinosa Mar 28, 2022
7046c31
Merge branch 'merging-template-updates-2.3.2' of https://github.com/J…
JoseEspinosa Mar 28, 2022
daf3bba
Update macs2 callpeak
JoseEspinosa Mar 28, 2022
71ec9d8
Trying to finally make prettier happy
JoseEspinosa Mar 28, 2022
2958849
Merge pull request #265 from JoseEspinosa/merging-template-updates-2.3.2
drpatelh Mar 28, 2022
b76c906
Install chromap 0.2.1 module
JoseEspinosa Mar 30, 2022
2e3af0d
Add chromap as mapper
JoseEspinosa Mar 30, 2022
3797d2d
Add chromap as a choice for aligner (schema)
JoseEspinosa Mar 30, 2022
dbdefe6
Make prettier happy
JoseEspinosa Mar 30, 2022
3fc73c3
Update changelog
JoseEspinosa Mar 30, 2022
ffa1038
Apply review suggestions
JoseEspinosa Mar 30, 2022
72d6078
Merge pull request #267 from JoseEspinosa/chromap_0.2.1
JoseEspinosa Mar 30, 2022
3800855
1st iteration for filtering macs2 files without peaks
JoseEspinosa Mar 30, 2022
684906d
Fix issue with phantompeakqualtools
JoseEspinosa Mar 31, 2022
3f18b50
Arguments order matter
JoseEspinosa Mar 31, 2022
70c2c76
Install phantompeakqualtools from modules
JoseEspinosa Apr 1, 2022
7ff25be
Fix prettier
JoseEspinosa Apr 1, 2022
813cb38
Merge pull request #269 from JoseEspinosa/i_220
drpatelh Apr 1, 2022
c010a0f
Merge remote-tracking branch 'upstream/dev' into peaks_#128
JoseEspinosa Apr 1, 2022
dae04ec
Filter empty peaks files
JoseEspinosa Apr 19, 2022
0ea8f11
Replace "if" by "when" otherwise error when the if condition is not met
JoseEspinosa Apr 19, 2022
081ff45
Update changelog
JoseEspinosa Apr 19, 2022
32698df
Merge pull request #268 from JoseEspinosa/peaks_#128
JoseEspinosa Apr 20, 2022
3152314
Bring back publish_dir_mode
JoseEspinosa Apr 20, 2022
265170b
Update changelog
JoseEspinosa Apr 20, 2022
c1975ca
Merge pull request #270 from JoseEspinosa/publish_dir_mode
drpatelh Apr 20, 2022
1f5a9f8
Update modules
JoseEspinosa Apr 20, 2022
938d034
Update samtools flagstat
JoseEspinosa Apr 21, 2022
e9f4e09
Update bam_filter mulled container
JoseEspinosa Apr 21, 2022
715ff24
Update tools versions in changelog
JoseEspinosa Apr 21, 2022
d0f6680
Make prettier happy
JoseEspinosa Apr 21, 2022
2f556a1
Update FRIP_SCORE mulled container
JoseEspinosa Apr 22, 2022
d3e6824
Update bam_remove_orphans mulled container
JoseEspinosa Apr 22, 2022
dd79c1c
Update modules
JoseEspinosa Apr 22, 2022
503b95b
Update phantompeakqualtools module
JoseEspinosa Apr 26, 2022
9ffb7a0
Update custom_getchromsizes module
JoseEspinosa Apr 28, 2022
2ff1476
Update modules picard and trimgalore modules
JoseEspinosa May 2, 2022
d5d6647
Update picard arguments
JoseEspinosa May 2, 2022
1c65c16
Is good to save changes before commiting
JoseEspinosa May 2, 2022
33d3bdd
Address PR comments (gunzip also has meta ,...)
JoseEspinosa May 3, 2022
420bcb7
Merge pull request #271 from JoseEspinosa/update_modules
drpatelh May 3, 2022
c70659f
Replace last remaining vanilla Linux Biocontainer
drpatelh May 9, 2022
4a6069d
Merge pull request #275 from drpatelh/updates
JoseEspinosa May 9, 2022
458d121
Template update for nf-core/tools version 2.4
nf-core-bot May 16, 2022
cdb91ac
Merge branch 'TEMPLATE' of https://github.com/nf-core/chipseq into me…
JoseEspinosa May 17, 2022
a6eb781
Uncomment again cromap in test
JoseEspinosa May 17, 2022
d2968e4
Fix readme zenodo link
JoseEspinosa May 17, 2022
7b57474
Update changelog
JoseEspinosa May 17, 2022
c8c3119
Correct tools version in changelog
JoseEspinosa May 17, 2022
6ba6dd5
Merge pull request #278 from JoseEspinosa/merging-template-2.4.1
JoseEspinosa May 17, 2022
06a4372
Add deeptools plotfingerprint labels
JoseEspinosa May 18, 2022
9de3362
Fix channel assignation
JoseEspinosa May 18, 2022
3faadf0
Fix assignation of pvalue and qvalue for macs2 callpeak
JoseEspinosa May 18, 2022
ab1afe3
Fix skip_peak_annotation and skip_peak_qc options
JoseEspinosa May 19, 2022
377028f
Aligning code in emits of local modules
JoseEspinosa May 19, 2022
d3ff899
Preseq run on the output of picard markduplicates and not after remov…
JoseEspinosa May 19, 2022
d9eddb3
Remove input from required params
JoseEspinosa May 25, 2022
a20cf2a
Remove multiqc headers that were defined twice
JoseEspinosa May 26, 2022
fae13fa
Fix reference to chipseq in multiqc headers
JoseEspinosa May 26, 2022
770921e
Fix nested conditions
JoseEspinosa Jun 16, 2022
5458e90
Fix deseq condition (back to the same as DSL1 ver)
JoseEspinosa Jun 16, 2022
7e1d4f2
Make sure fmeta are local inside map
JoseEspinosa Jun 16, 2022
d33d557
Make fasta available for igv
JoseEspinosa Jun 23, 2022
59a07d9
Get rid of testing code
JoseEspinosa Jun 23, 2022
7c50dfd
Remove ch_markduplicates_multiqc since is directly reported as MARK_D…
JoseEspinosa Jun 27, 2022
a2bd7e2
Remove prefix since is not used in samtools_index
JoseEspinosa Jun 27, 2022
34cdc2f
Move macs2_consensus "when" to modules.config
JoseEspinosa Jun 28, 2022
d35739d
Skip preseq on test config
JoseEspinosa Jun 28, 2022
277bd11
Address review comments
JoseEspinosa Jun 28, 2022
d330c9f
Merge pull request #279 from JoseEspinosa/fixes
drpatelh Jun 28, 2022
69c8db1
Updated macs_gsize on igenomes and add a process to calculate it if …
JoseEspinosa Jun 30, 2022
329ba7a
prettier and schema do not like each other
JoseEspinosa Jun 30, 2022
58c2f4c
Update previously existing macs_gsize with "read_length hashes"
JoseEspinosa Jun 30, 2022
420d057
Update changelog
JoseEspinosa Jun 30, 2022
4a73a20
Update CHANGELOG.md
JoseEspinosa Jun 30, 2022
a3289a5
Install khmer uniquekmers as a nf-core module
JoseEspinosa Jun 30, 2022
c771d94
Set read_length to null and exit when param not provided
JoseEspinosa Jun 30, 2022
a6f6e47
Update rest of macs_gsize maps
JoseEspinosa Jul 1, 2022
1221e79
Fix spaces
JoseEspinosa Jul 1, 2022
d6f4621
Get rid of default read_length in schema
JoseEspinosa Jul 6, 2022
b3badc2
Update lib/WorkflowChipseq.groovy
JoseEspinosa Jul 6, 2022
40f1d8f
Update lib/WorkflowChipseq.groovy
JoseEspinosa Jul 6, 2022
030ef2c
Update lib/WorkflowChipseq.groovy
JoseEspinosa Jul 6, 2022
e62830d
Update nextflow_schema.json
JoseEspinosa Jul 6, 2022
1a0999c
Update nextflow_schema.json
drpatelh Jul 6, 2022
9f783fb
Fix file naming for HOMER_ANNOTATEPEAKS_MACS2
JoseEspinosa Jul 6, 2022
304bfee
Merge branch 'macs_gsize_update' of https://github.com/JoseEspinosa/n…
JoseEspinosa Jul 6, 2022
6bf39d5
Merge pull request #283 from JoseEspinosa/macs_gsize_update
drpatelh Jul 6, 2022
b998041
Fix untar chromap
JoseEspinosa Jul 6, 2022
bf5baae
Generate IGV session regardless of consensus execution
JoseEspinosa Jul 6, 2022
b55dece
Move deseq2_qc condition to ext.when modules config
JoseEspinosa Jul 6, 2022
106419f
Change type to avoid issue when casting to integer
JoseEspinosa Jul 11, 2022
5f3020f
Merge pull request #285 from JoseEspinosa/i_284
JoseEspinosa Jul 11, 2022
b98bbb2
Merge remote-tracking branch 'upstream/dev' into more_fixes
JoseEspinosa Jul 11, 2022
9e01e90
Do not publish khmer_uniquekmers results
JoseEspinosa Jul 11, 2022
6becc25
Fix paths according to dsl1 pipeline version
JoseEspinosa Jul 12, 2022
07ca7be
Fix ext.when condition of deseq2_qc
JoseEspinosa Jul 12, 2022
c21ba79
Publish genome fa idx, include regions and chr sizes by default as in…
JoseEspinosa Jul 19, 2022
46d5a22
Rename again macs folders as macs2
JoseEspinosa Jul 19, 2022
c67864f
Fix typo
JoseEspinosa Jul 19, 2022
647064c
Fix path
JoseEspinosa Jul 19, 2022
322a7d9
Add read_length to test_full for retrieving macs_gsize
JoseEspinosa Jul 19, 2022
f69ffbd
Fix dir structure inside macs2 consensus
JoseEspinosa Jul 19, 2022
4ec3b2c
Fix file publication according to dsl1 pipeline
JoseEspinosa Jul 20, 2022
b968ee0
Merge branch 'more_fixes' of https://github.com/JoseEspinosa/chipseq …
JoseEspinosa Jul 20, 2022
381636a
Fix indent
JoseEspinosa Jul 20, 2022
ef3d550
More file publication fixes
JoseEspinosa Jul 20, 2022
b077c38
Fix tyop
JoseEspinosa Jul 20, 2022
f86d283
Change macs to macs2 output dir
JoseEspinosa Jul 20, 2022
ff91222
Fix typo and not publish chromap bams before sorting
JoseEspinosa Jul 21, 2022
07ea27f
Add save_unaligned for bowtie2
JoseEspinosa Jul 21, 2022
25800a7
Add save_unaligned for bowtie2 and refactor in star
JoseEspinosa Jul 21, 2022
ba3b171
Update output.md
JoseEspinosa Jul 21, 2022
5c37b56
Remove comparisons not available anymore
JoseEspinosa Jul 21, 2022
89d5bdf
Change trim_galore by trimgalore in output.md
JoseEspinosa Jul 21, 2022
d37edb2
Update modules
JoseEspinosa Jul 21, 2022
a5aad85
Fix error when skipping consensus peaks due to ext.when use
JoseEspinosa Jul 21, 2022
dc7b586
Be careful when copy/pasting
JoseEspinosa Jul 21, 2022
fa733cc
Update changelog
JoseEspinosa Jul 21, 2022
9582d07
Merge pull request #287 from JoseEspinosa/more_fixes
JoseEspinosa Jul 22, 2022
8a5f546
Fix path to igv files
JoseEspinosa Jul 25, 2022
ea4b0cf
Fix consensus peaks path for IGV
JoseEspinosa Jul 25, 2022
190939e
Fix consensus peaks path for IGV
JoseEspinosa Jul 27, 2022
f3f3a70
Switch --preset chip by its argument to not include the removal of du…
JoseEspinosa Jul 27, 2022
61ecb07
Add chromap back to ci tests
JoseEspinosa Jul 27, 2022
4a191ab
Suggested fix for macs
JoseEspinosa Jul 29, 2022
f5e46f6
Filter paired end data when using chromap
JoseEspinosa Aug 2, 2022
d013f66
Merge branch 'morefixes' of https://github.com/JoseEspinosa/chipseq i…
JoseEspinosa Aug 2, 2022
f57d8da
Fix indexes publication
JoseEspinosa Aug 3, 2022
17aac1d
Change deeptools by deepTools (results dir)
JoseEspinosa Aug 3, 2022
a28cd28
Add annotate_boolean_peaks process
JoseEspinosa Aug 3, 2022
53f2673
Emit output of annotate_boolean_peaks
JoseEspinosa Aug 4, 2022
0bcdb84
Fix publish folder for annotate_boolean_peaks
JoseEspinosa Aug 4, 2022
b627caa
Emit rds file form deseq2
JoseEspinosa Aug 4, 2022
2aff26a
Update docs
JoseEspinosa Aug 4, 2022
f845951
Update changelog
JoseEspinosa Aug 4, 2022
e309bc1
Fix indents
JoseEspinosa Aug 4, 2022
7a2b89f
Merge branch 'morefixes' of https://github.com/JoseEspinosa/chipseq i…
JoseEspinosa Aug 4, 2022
c31fb69
Make prettier happy
JoseEspinosa Aug 4, 2022
9c5c5ff
Update changelog
JoseEspinosa Aug 4, 2022
fd59088
Update readme and usage
JoseEspinosa Aug 4, 2022
1b91929
Add bytesize talk to readme
JoseEspinosa Aug 5, 2022
b87af07
Make prettier happy
JoseEspinosa Aug 5, 2022
9e39ea2
Merge pull request #290 from JoseEspinosa/morefixes
JoseEspinosa Aug 9, 2022
18b8df8
Bump pipeline version to 2.0.0
JoseEspinosa Aug 10, 2022
f1894d1
Bump multiqc version to 1.13a
JoseEspinosa Aug 10, 2022
d04bf03
Merge pull request #292 from JoseEspinosa/updates
JoseEspinosa Aug 10, 2022
e84f6c5
Add chromap to aws full test
JoseEspinosa Aug 10, 2022
0445964
Remove duplicated item in version table and fix version
JoseEspinosa Aug 10, 2022
6601012
Add trimgalore new version to changelog
JoseEspinosa Aug 10, 2022
0474b72
Merge pull request #294 from JoseEspinosa/updates
JoseEspinosa Aug 10, 2022
2344f27
Move ANNOTATE_BOOLEAN_PEAKS under skip_peak_annotation
JoseEspinosa Aug 12, 2022
b61074c
Update parameters table
JoseEspinosa Aug 12, 2022
318e060
Make prettier happy
JoseEspinosa Aug 12, 2022
67a9cdc
Fix pipeline logo
drpatelh Aug 15, 2022
4b9427e
Merge pull request #296 from drpatelh/updates
JoseEspinosa Aug 15, 2022
82785a8
Merge pull request #295 from JoseEspinosa/updates
bjlang Aug 16, 2022
d83f76f
Update .gitignore
JoseEspinosa Aug 16, 2022
b54cdd5
Update CHANGELOG.md
JoseEspinosa Aug 16, 2022
63ee901
Update CHANGELOG.md
JoseEspinosa Aug 16, 2022
bb103d7
Update assets/multiqc/deseq2_clustering_header.txt
JoseEspinosa Aug 16, 2022
a05e1aa
Update assets/multiqc/deseq2_pca_header.txt
JoseEspinosa Aug 16, 2022
13f0f3e
Update citations as suggested in review
JoseEspinosa Aug 17, 2022
676ea18
Fix nf-core lint after accepted suggestion
JoseEspinosa Aug 17, 2022
5239e98
Remove differential analysis options
JoseEspinosa Aug 17, 2022
c31ac79
Remove deseq_qc_options key from schema
JoseEspinosa Aug 17, 2022
dd10518
Remove samplesheet.csv
JoseEspinosa Aug 17, 2022
c31c2a9
Add deseq and fix homer annotate peaks in multiqc
JoseEspinosa Aug 26, 2022
f2eabfd
Fix channel declaration
JoseEspinosa Aug 26, 2022
20a25bf
Declare channel before skip to avoid error
JoseEspinosa Aug 26, 2022
4760fc7
Fix labels for deeptools plotfingerprint
JoseEspinosa Aug 30, 2022
3e91dcd
Template update for nf-core/tools version 2.5
nf-core-bot Aug 30, 2022
ef3ffb3
Merge pull request #297 from JoseEspinosa/updates
bjlang Aug 30, 2022
d2d38ee
Template update for nf-core/tools version 2.5.1
nf-core-bot Sep 1, 2022
701c015
Fix merge conflicts
drpatelh Sep 12, 2022
a91436b
Fix nf-core lint
drpatelh Sep 12, 2022
4e83d3d
Fix Black
drpatelh Sep 12, 2022
c82f2f7
Fix Prettier
drpatelh Sep 12, 2022
023c1be
Fix indent in main.nf
drpatelh Sep 12, 2022
1d469ce
Remove new lines
drpatelh Sep 12, 2022
c1b8bc8
Fix channels for GUNZIP processes
drpatelh Sep 12, 2022
9204c7d
Fix channels for UNTAR processes
drpatelh Sep 12, 2022
1683f39
Merge pull request #302 from nf-core/nf-core-template-merge-2.5.1
drpatelh Sep 12, 2022
7b44421
Fix or reword bits in the pipeline
drpatelh Sep 14, 2022
377489f
Add prefix to homer module
drpatelh Sep 14, 2022
ea94263
Fix missing tools in MultiQC report
drpatelh Sep 14, 2022
bd1dd00
Print versions for correct process
drpatelh Sep 14, 2022
ef3637b
Fix FRiP score being printed twice to file
drpatelh Sep 14, 2022
f518dd8
Re-factor channel joining for ip and control
drpatelh Sep 15, 2022
6f17b33
Add meta.id tag where missing to local modules
drpatelh Sep 15, 2022
474e226
Re-factor channel joining for featurecounts
drpatelh Sep 15, 2022
3e1857d
Remove antibody variable reference in DESeq2 module
drpatelh Sep 15, 2022
d984c09
Switch deseq2_vst to true by default
drpatelh Sep 15, 2022
3ea0140
Add missing header comments to all modules/subworkflows
drpatelh Sep 15, 2022
42feb6f
Fix bug
drpatelh Sep 15, 2022
9e83c05
Fix prettier
drpatelh Sep 15, 2022
e7c5516
Update docs/output.md
drpatelh Sep 15, 2022
84c2299
Merge pull request #304 from drpatelh/updates
JoseEspinosa Sep 15, 2022
a32cef8
Add missing ending tag
JoseEspinosa Sep 15, 2022
c4c0c3d
Merge pull request #305 from JoseEspinosa/updates
drpatelh Sep 15, 2022
ce0ed8d
Remove redundanct comment
drpatelh Sep 16, 2022
bcc9702
Change find command to be more specific
drpatelh Sep 16, 2022
255992d
Add tower.yml to render Reports for main files on Tower
drpatelh Sep 16, 2022
59d32c8
Merge pull request #306 from drpatelh/updates
robsyme Sep 16, 2022
3ed06fa
Remove pinning for R packages used in DESeq2 script
drpatelh Oct 1, 2022
09ca349
Add antibody directory to consensus peaks in IGV session
drpatelh Oct 1, 2022
80fd01c
Update date in CHANGELOG
drpatelh Oct 1, 2022
40db9a5
Update igv_files_to_session.py script
drpatelh Oct 2, 2022
6f8a372
Fix if no consensus peaks are provided
drpatelh Oct 2, 2022
6428b3f
Black
drpatelh Oct 2, 2022
ed10bb9
Fix linting
drpatelh Oct 2, 2022
7ed79d4
Merge pull request #308 from drpatelh/updates
JoseEspinosa Oct 2, 2022
f62ea83
Add back antibody to consensus paths in output description
JoseEspinosa Oct 2, 2022
e39a770
Merge pull request #309 from JoseEspinosa/updates
drpatelh Oct 3, 2022
f96dfd6
Update changelog
JoseEspinosa Oct 3, 2022
fd95002
Merge pull request #310 from JoseEspinosa/updates
drpatelh Oct 3, 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
27 changes: 27 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4
indent_style = space

[*.{md,yml,yaml,html,css,scss,js,cff}]
indent_size = 2

# These files are edited and tested upstream in nf-core/modules
[/modules/nf-core/**]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset

[/assets/email*]
indent_size = unset

[/assets/blacklists/GRCh37-blacklist.bed]
trim_trailing_whitespace = unset
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
*.config linguist-language=nextflow
modules/nf-core/** linguist-generated
subworkflows/nf-core/** linguist-generated
6 changes: 6 additions & 0 deletions .github/.dockstore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Dockstore config version, not pipeline version
version: 1.2
workflows:
- subclass: nfl
primaryDescriptorPath: /nextflow.config
publish: True
68 changes: 57 additions & 11 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ Contributions to the code are even more welcome ;)

If you'd like to write some code for nf-core/chipseq, the standard workflow is as follows:

1. Check that there isn't already an issue about your idea in the [nf-core/chipseq issues](https://github.com/nf-core/chipseq/issues) to avoid duplicating work
* If there isn't one already, please create one so that others know you're working on this
1. Check that there isn't already an issue about your idea in the [nf-core/chipseq issues](https://github.com/nf-core/chipseq/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/chipseq repository](https://github.com/nf-core/chipseq) to your GitHub account
3. Make the necessary changes / additions within your forked repository
4. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
4. Use `nf-core schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10).
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged

If you're not used to this workflow with git, you can start with some [docs from GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests) or even their [excellent `git` resources](https://try.github.io/).

Expand All @@ -30,14 +30,14 @@ Typically, pull-requests are only fully reviewed when these tests are passing, t

There are typically two types of tests that run:

### Lint Tests
### Lint tests

`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core lint <pipeline-directory>` command.

If any failures or warnings are encountered, please follow the listed URL for more documentation.

### Pipeline Tests
### Pipeline tests

Each `nf-core` pipeline should be set up with a minimal set of test-data.
`GitHub Actions` then runs the pipeline on this data to ensure that it exits successfully.
Expand All @@ -46,12 +46,58 @@ These tests are run both with the latest available version of `Nextflow` and als

## Patch

: warning: Only in the unlikely and regretful event of a release happening with a bug.
:warning: Only in the unlikely and regretful event of a release happening with a bug.

* On your own fork, make a new branch `patch` based on `upstream/master`.
* Fix the bug, and bump version (X.Y.Z+1).
* A PR should be made on `master` from patch to directly this particular bug.
- On your own fork, make a new branch `patch` based on `upstream/master`.
- Fix the bug, and bump version (X.Y.Z+1).
- A PR should be made on `master` from patch to directly this particular bug.

## Getting help

For further information/help, please consult the [nf-core/chipseq documentation](https://nf-co.re/nf-core/chipseq/docs) and don't hesitate to get in touch on the nf-core Slack [#chipseq](https://nfcore.slack.com/channels/chipseq) channel ([join our Slack here](https://nf-co.re/join/slack)).
For further information/help, please consult the [nf-core/chipseq documentation](https://nf-co.re/chipseq/usage) and don't hesitate to get in touch on the nf-core Slack [#chipseq](https://nfcore.slack.com/channels/chipseq) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Pipeline contribution conventions

To make the nf-core/chipseq code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.

### Adding a new step

If you wish to contribute a new step, please use the following coding standards:

1. Define the corresponding input channel into your new process from the expected previous process channel
2. Write the process block (see below).
3. Define the output channel if needed (see below).
4. Add any new parameters to `nextflow.config` with a default (see below).
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool).
6. Add sanity checks and validation for all relevant parameters.
7. Perform local tests to validate that the new code works as expected.
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
9. Update MultiQC config `assets/multiqc_config.yml` so relevant suffixes, file name clean up and module plots are in the appropriate order. If applicable, add a [MultiQC](https://https://multiqc.info/) module.
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.

### Default values

Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.

Once there, use `nf-core schema build` to add to `nextflow_schema.json`.

### Default processes resource requirements

Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.

The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block.

### Naming schemes

Please use the following naming schemes, to make it easy to understand what is going where.

- initial process channel: `ch_output_from_<process>`
- intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>`

### Nextflow version bumping

If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core bump-version --nextflow . [min-nf-version]`

### Images and figures

For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines).
42 changes: 0 additions & 42 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Bug report
description: Report something that is broken or incorrect
labels: bug
body:
- type: markdown
attributes:
value: |
Before you post this issue, please check the documentation:

- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
- [nf-core/chipseq pipeline documentation](https://nf-co.re/chipseq/usage)

- type: textarea
id: description
attributes:
label: Description of the bug
description: A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
id: command_used
attributes:
label: Command used and terminal output
description: Steps to reproduce the behaviour. Please paste the command you used to launch the pipeline and the output from your terminal.
render: console
placeholder: |
$ nextflow run ...

Some output where something broke

- type: textarea
id: files
attributes:
label: Relevant files
description: |
Please drag and drop the relevant files here. Create a `.zip` archive if the extension is not allowed.
Your verbose log file `.nextflow.log` is often useful _(this is a hidden file in the directory where you launched the pipeline)_ as well as custom Nextflow configuration files.

- type: textarea
id: system
attributes:
label: System information
description: |
* Nextflow version _(eg. 21.10.3)_
* Hardware _(eg. HPC, Desktop, Cloud)_
* Executor _(eg. slurm, local, awsbatch)_
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
* Version of nf-core/chipseq _(eg. 1.1, 1.5, 1.8.2)_
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
contact_links:
- name: Join nf-core
url: https://nf-co.re/join
about: Please join the nf-core community here
- name: "Slack #chipseq channel"
url: https://nfcore.slack.com/channels/chipseq
about: Discussion about the nf-core/chipseq pipeline
24 changes: 0 additions & 24 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Feature request
description: Suggest an idea for the nf-core/chipseq pipeline
labels: enhancement
body:
- type: textarea
id: description
attributes:
label: Description of feature
description: Please describe your suggestion for a new feature. It might help to describe a problem or use case, plus any alternatives that you have considered.
validations:
required: true
23 changes: 14 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
<!--
# nf-core/chipseq pull request

Many thanks for contributing to nf-core/chipseq!

Please fill in the appropriate checklist below (delete whatever is not relevant).
These are the most common things requested on pull requests (PRs).

Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.

Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/chipseq/tree/master/.github/CONTRIBUTING.md)
-->

## PR checklist

- [ ] This comment contains a description of changes (with reason)
- [ ] This comment contains a description of changes (with reason).
- [ ] If you've fixed a bug or added code that should be tested, add tests!
- [ ] If necessary, also make a PR on the [nf-core/chipseq branch on the nf-core/test-datasets repo](https://github.com/nf-core/test-datasets/pull/new/nf-core/chipseq)
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Make sure your code lints (`nf-core lint .`).
- [ ] Documentation in `docs` is updated
- [ ] `CHANGELOG.md` is updated
- [ ] `README.md` is updated

**Learn more about contributing:** [CONTRIBUTING.md](https://github.com/nf-core/chipseq/tree/master/.github/CONTRIBUTING.md)
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/chipseq/tree/master/.github/CONTRIBUTING.md)- [ ] If necessary, also make a PR on the nf-core/chipseq _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>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
- [ ] Output Documentation in `docs/output.md` is updated.
- [ ] `CHANGELOG.md` is updated.
- [ ] `README.md` is updated (including new tool citations and authors/contributors).
9 changes: 0 additions & 9 deletions .github/markdownlint.yml

This file was deleted.

67 changes: 31 additions & 36 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,31 @@
name: nf-core AWS full size tests
# This workflow is triggered on releases.
# It runs the -profile 'test_full' on AWS batch

on:
release:
types: [published]

jobs:
run-awstest:
if: github.repository == 'nf-core/chipseq'
name: Run AWS test
runs-on: ubuntu-latest
steps:
- name: Setup Miniconda
uses: goanpeca/setup-miniconda@v1.0.2
with:
auto-update-conda: true
python-version: 3.7
- name: Install awscli
run: conda install -c conda-forge awscli
- name: Start AWS batch job
env:
AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
TOWER_ACCESS_TOKEN: ${{secrets.AWS_TOWER_TOKEN}}
#AWS_JOB_DEFINITION: ${{secrets.AWS_JOB_DEFINITION}}
AWS_JOB_QUEUE: ${{secrets.AWS_JOB_QUEUE}}
AWS_S3_BUCKET: ${{secrets.AWS_S3_BUCKET}}
run: | # Submits job to AWS batch using a 'nextflow-4GiB' job definition. Setting JVM options to "-XX:+UseG1GC" for more efficient garbage collection when staging remote files.
aws batch submit-job \
--region eu-west-1 \
--job-name nf-core-chipseq \
--job-queue $AWS_JOB_QUEUE \
--job-definition nextflow-4GiB \
--container-overrides '{"command": ["nf-core/chipseq", "-r '"${GITHUB_SHA}"' -profile test_full --outdir s3://'"${AWS_S3_BUCKET}"'/chipseq/results-'"${GITHUB_SHA}"' -w s3://'"${AWS_S3_BUCKET}"'/chipseq/work-'"${GITHUB_SHA}"' -with-tower"], "environment": [{"name": "TOWER_ACCESS_TOKEN", "value": "'"$TOWER_ACCESS_TOKEN"'"}, {"name": "NXF_OPTS", "value": "-XX:+UseG1GC"}]}'
name: nf-core AWS full size tests
# This workflow is triggered on published releases.
# It can be additionally triggered manually with GitHub actions workflow dispatch button.
# It runs the -profile 'test_full' on AWS batch

on:
release:
types: [published]
workflow_dispatch:
jobs:
run-tower:
name: Run AWS full tests
if: github.repository == 'nf-core/chipseq'
runs-on: ubuntu-latest
strategy:
matrix:
aligner: ["bwa", "bowtie2", "chromap", "star"]
steps:
- name: Launch workflow via tower
uses: nf-core/tower-action@v3
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/chipseq/work-${{ github.sha }}
parameters: |
{
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/chipseq/results-${{ github.sha }}"
"aligner": "${{ matrix.aligner }}"
}
profiles: test_full,aws_tower
Loading