Skip to content

Commit

Permalink
Merge develop for v0.2.0 and update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
emi80 committed Dec 18, 2017
2 parents 2aa5dc5 + 02f0b04 commit 1cc8639
Show file tree
Hide file tree
Showing 22 changed files with 404 additions and 72 deletions.
42 changes: 42 additions & 0 deletions .circ
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# add project folder to PATH
projectDir=$(dirname $(realpath $_))
export PATH=${projectDir}:$PATH

NXF_OPTIONS=$(nextflow help run | egrep -o '\-\w+\.?' | sort -u)
PIPE_OPTIONS=$(egrep log chipseq-pipeline.nf | egrep -o '\-{2}[^ ]+ ')

_ci() {
local cur prev

cur=${COMP_WORDS[COMP_CWORD]}
prev=${COMP_WORDS[COMP_CWORD-1]}

case ${COMP_CWORD} in
1)
COMPREPLY=($(compgen -W "run validate cleanup" ${cur}))
;;
[2-9]|[1-9][0-9])
case ${COMP_WORDS[1]} in
run)
case "${cur}" in
-*)
COMPREPLY=($(compgen -o default -W "$NXF_OPTIONS $PIPE_OPTIONS" -- ${cur}))
;;
*)
COMPREPLY=($(compgen -o default))
;;
esac
;;
validate)
COMPREPLY=($(compgen -f ${cur}))
;;
esac
;;
*)
COMPREPLY=()
;;
esac
}

# add command autocompletion
complete -o nospace -F _ci ci
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# ChIP-nf Changelog

## Version 0.2.0

- Update groupTuple for merging and fix input sorting for Zerone - resolves #3
- Add paramter to set MACS2 temp dir and set default to process folder
- Use global fragment length from cli option when not shifting - close #2
- Fix issue with samples using the same control
- Add more test data
- Update pipeline with Zerone process and change config and readme

## Version 0.1.0

First version
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:macs2-outfiles: https://github.com/taoliu/MACS#output-files
:pvalue: pass:q[[red]#___-log_10(P)___#]
:circle-shield: https://circleci.com/gh/guigolab/chip-nf.svg?style=shield
:nf-shield: https://img.shields.io/badge/nextflow-%E2%89%A50.17.0-blue.svg
:nf-shield: https://img.shields.io/badge/nextflow-%E2%89%A50.23.1-blue.svg

image:{nf-shield}["Nextflow", link="https://nextflow.io", window="_blank"]
image:{circle-shield}["CircleCI status", link="https://circleci.com/gh/guigolab/chip-nf", window="_blank"]
Expand Down
Loading

0 comments on commit 1cc8639

Please sign in to comment.