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

Ver2rc #98

Open
wants to merge 46 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
7ca9f17
export more cutadapt parameters.
jianhong Jul 19, 2023
3dd9f7c
export more cutadapt parameters.
jianhong Jul 19, 2023
337e755
push the changes for last submit.
jianhong Aug 7, 2023
a349011
add function to detect the contamination by karken2.
jianhong Aug 8, 2023
cac169c
export pairtools_walks_policy parameter.
jianhong Aug 8, 2023
10be2f7
update changelog.
jianhong Aug 8, 2023
5f966bd
update the pipeline to skip cutadapt_3end by default.
jianhong Aug 9, 2023
5e6febe
fix the wrong input for cutadapt_3end.
jianhong Aug 10, 2023
6f15719
update the keywords to skip cutadapt 3end.
jianhong Aug 10, 2023
a47d456
use the standard kraken2 db as default.
jianhong Aug 11, 2023
190554f
change the cutadapt_action default setting.
jianhong Aug 16, 2023
72baac1
Merge branch 'dev' into dev2rc; fix the file name collision for KRONA…
jianhong Aug 18, 2023
b8a2f29
run black to fix the python script format.
jianhong Aug 22, 2023
6653593
change the version number to 2.0.0dev.
jianhong Aug 22, 2023
95664b9
update to nf-core/samtools/sort
jianhong Aug 22, 2023
bd24b34
fix a typo in nextflow_schema.json.
jianhong Aug 22, 2023
4834e52
try to fix the multiqc_config.yml missing report_comment error.
jianhong Aug 23, 2023
491348f
try again.
jianhong Aug 23, 2023
097bdf3
update igv.js tracks to avoid the error that if skip interaction caller.
jianhong Aug 28, 2023
79e59df
fix a bug in creating maps signal cooler file.
jianhong Aug 28, 2023
18c7c68
export the filtered pairs files.
jianhong Aug 30, 2023
cb7ed09
add control for skip circos.
jianhong Aug 30, 2023
a8f5d91
fix a bug that if genome fastq file can not be handled by the bwa index.
jianhong Aug 31, 2023
199e586
update the Channel of genome fasta.
jianhong Sep 12, 2023
fbb14db
add output controler for pairs file.
jianhong Sep 12, 2023
7264b78
try to fix the github storage issue by free-dist-space.
jianhong Sep 13, 2023
c40da83
try again.
jianhong Sep 13, 2023
a3040ce
Template update for nf-core/tools version 2.10
nf-core-bot Sep 25, 2023
6445db7
add parse2 module.
jianhong Sep 28, 2023
a52e1c8
fix the sort memory issue (exit code 139 with fragment fault)
jianhong Oct 2, 2023
6f92af8
add tmpdir parameter for pairtools sort.
jianhong Oct 3, 2023
7bb8856
try to fix the pairtools sort memory issue.
jianhong Oct 4, 2023
ca243ea
add same fragement stats and change the TSSEscre calculation range.
jianhong Oct 10, 2023
9fbf57d
fix the potential issue if the container can not download the source …
jianhong Oct 11, 2023
c4eb5e2
update pairtools/sort
jianhong Oct 13, 2023
65e6370
Merge remote-tracking branch 'upstream/nf-core-template-merge-2.10' i…
jianhong Oct 13, 2023
35c2061
Merge remote-tracking branch 'origin/dev2rc' into ver2rc
jianhong Oct 13, 2023
1672d78
fix the space issue.
jianhong Oct 13, 2023
92f03cf
update the citation in WorkflowHicar.groovy
jianhong Oct 13, 2023
cb8c227
Merge remote-tracking branch 'origin/dev2rc' into ver2rc
jianhong Oct 13, 2023
5eeddfb
try to pass the linting.
jianhong Oct 13, 2023
308ac1d
add dev to the version number back.
jianhong Oct 13, 2023
c39c820
remove the 'dev' for multiqc_config.yml
jianhong Oct 13, 2023
53811a6
remove dev from multiqc_config.yml
jianhong Oct 13, 2023
494e189
Merge remote-tracking branch 'origin/dev2rc' into ver2rc
jianhong Oct 13, 2023
95c828f
remove dev from nextflow.config.
jianhong Oct 13, 2023
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
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"remoteUser": "gitpod",
"runArgs": ["--privileged"],

// Configure tool-specific properties.
"customizations": {
Expand Down
4 changes: 3 additions & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ Please use the pre-filled template to save time.
However, don't be put off by this template - other more general issues and suggestions are welcome!
Contributions to the code are even more welcome ;)

> If you need help using or modifying nf-core/hicar then the best place to ask is on the nf-core Slack [#hicar](https://nfcore.slack.com/channels/hicar) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::info
If you need help using or modifying nf-core/hicar then the best place to ask is on the nf-core Slack [#hicar](https://nfcore.slack.com/channels/hicar) channel ([join our Slack here](https://nf-co.re/join/slack)).
:::

## Contribution workflow

Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ jobs:
- "--method HiChIP --anchor_peaks 'https://raw.githubusercontent.com/aryeelab/hichipper/master/tests/chipseq/GM12878_SMC3_ChIPSeq_chr22.narrowPeak'"

steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true

- name: Check out pipeline code
uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.11"
architecture: "x64"

- name: Install dependencies
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/release-announcments.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: release-announcements
# Automatic release toot and tweet anouncements
on:
release:
types: [published]
workflow_dispatch:

jobs:
toot:
runs-on: ubuntu-latest
steps:
- uses: rzr/fediverse-action@master
with:
access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }}
host: "mstdn.science" # custom host if not "mastodon.social" (default)
# GitHub event payload
# https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#release
message: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

Please see the changelog: ${{ github.event.release.html_url }}

send-tweet:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@v4
with:
python-version: "3.10"
- name: Install dependencies
run: pip install tweepy==4.14.0
- name: Send tweet
shell: python
run: |
import os
import tweepy

client = tweepy.Client(
access_token=os.getenv("TWITTER_ACCESS_TOKEN"),
access_token_secret=os.getenv("TWITTER_ACCESS_TOKEN_SECRET"),
consumer_key=os.getenv("TWITTER_CONSUMER_KEY"),
consumer_secret=os.getenv("TWITTER_CONSUMER_SECRET"),
)
tweet = os.getenv("TWEET")
client.create_tweet(text=tweet)
env:
TWEET: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

Please see the changelog: ${{ github.event.release.html_url }}
TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}

bsky-post:
runs-on: ubuntu-latest
steps:
- uses: zentered/bluesky-post-action@v0.0.2
with:
post: |
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

Please see the changelog: ${{ github.event.release.html_url }}
env:
BSKY_IDENTIFIER: ${{ secrets.BSKY_IDENTIFIER }}
BSKY_PASSWORD: ${{ secrets.BSKY_PASSWORD }}
#
22 changes: 12 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v2.0.0 - [07/13/2023]
## v2.0.0dev - [10/10/2023]

- [[#89](https://github.com/nf-core/hicar/pull/89)] - update to nf-core-template-2.9
- [[#90](https://github.com/nf-core/hicar/pull/90)] - remove the output folder setting from config files
- [replace the dots](https://github.com/nf-core/hicar/pull/89#issue-1797065776) by '\_' in the samples group
- add [support for MseI](https://github.com/jianhong/hicar/commit/64bfcecab9870100d56631ffc31ff0ed471e1255).
- update to nf-core-template-2.7.2
- replace the dots by '\_' in the samples name
- add support for MseI.
- add TAD, AB compartments, APA analysis (see available tools in usage documentation)
- add additional methods for interaction caller
- adjust default resource requirement
Expand All @@ -20,13 +19,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- removed local_modules tests
- add scale factor to atac reads coverage calculation
- change the circos plot style
- update reads_summary table to include unmapped/multiple mapped info
- update reads_summary table to include unmapped/multiple mapped, same fragement info
- change the TSSEscore from 1K upstream/downstream to 2K range.
- add the possibility to subsample to balance the input reads
- add parameter to let user input the 5 end sequence to cutadapt step
- change the cutadapt error tolerance from 0 to 0.15
- changes in hipeak caller:
- add filter condition for lowest count number as 1.
- change the cutoff value for hipeak type assignment step from 12 to 3.
- change the default cutadapt_action from none to trim
- add 3' trim to remove the second enzyme site if it appeared in after 50 base.
- export parameter for prepare trans counts for MAPS
- add parameter to select pairtools parse or parse2
- export parameter for pairtools parse and parse2
- add function to detect the contamination by karken2
- fix multiple bugs:
- the sorting method for huge bed file;
- the post count for hipeak when there is empty Interactions;
Expand All @@ -36,7 +39,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- fix the chromosome style for homer TFEA analysis and annotation by ChIPpeakAnno;
- fix the duplicated imported modules;
- fix multiple typos.
- use local SAMTOOLS_SORT module;

## v1.0.0 - [05/03/2022]

Expand Down
6 changes: 5 additions & 1 deletion CITATIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

- [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/)

> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online]. Available online https://www.bioinformatics.babraham.ac.uk/projects/fastqc/.
> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online].

- [GenMap](https://pubmed.ncbi.nlm.nih.gov/32246826/)

Expand All @@ -76,6 +76,10 @@

> Durand NC, Shamim MS, Machol I, Rao SS, Huntley MH, Lander ES, Aiden EL. Juicer Provides a One-Click System for Analyzing Loop-Resolution Hi-C Experiments. Cell Syst. 2016 Jul;3(1):95-8. doi: 10.1016/j.cels.2016.07.002. PMID: 27467249; PMCID: PMC5846465.

- [Kraken 2](https://ccb.jhu.edu/software/kraken2/)

> Wood DE, Lu J, Langmead B. Improved metagenomic analysis with Kraken 2. Genome Biol. 2019 Nov 28;20(1):257. doi: 10.1186/s13059-019-1891-0. PMID: 31779668; PMCID: PMC6883579.

- [MACS2](https://www.ncbi.nlm.nih.gov/pubmed/18798982/)

> Zhang Y, Liu T, Meyer CA, Eeckhoute J, Johnson DS, Bernstein BE, Nusbaum C, Myers RM, Brown M, Li W, Liu XS. Model-based analysis of ChIP-Seq (MACS). Genome Biol. 2008;9(9):R137. doi: 10.1186/gb-2008-9-9-r137. Epub 2008 Sep 17. PubMed PMID: 18798982; PubMed Central PMCID: PMC2592715.
Expand Down
Loading