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

make a new release #40

Merged
merged 8 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-node@v3

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

- name: Run ECLint check
run: editorconfig-checker -exclude README.md $(find .* -type f | grep -v '.git\|.py\|.md\|cff\|json\|yml\|yaml\|html\|css\|work\|.nextflow\|build\|nf_core.egg-info\|log.txt\|Makefile')
Expand Down
9 changes: 3 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
MIT License

Copyright (c) Damon-Lee B Pointon (@DLBPointon)
Copyright (c) 2022-2024 Genome Research Ltd.
except `bin/filter_five_end.pl`:
Copyright (c) 2017 Arima Genomics, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,8 +21,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


The filter_five_end.ph script has been taken from the Arima Mapping Pipeline, has not been modified and is subject to the below license:

Copyright (c) 2017 Arima Genomics, Inc.
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ Currently, the pipeline uses the following flags:

- The directory of the cram _and_ cram.crai files, e.g., `/path/to/cram/`

- `--map_order`

- hic map scaffold order, input either `length` or `unsorted`

- `--teloseq`

- A telomeric sequence, e.g., `TTAGGG`
Expand All @@ -66,7 +70,8 @@ nextflow run sanger-tol/curationpretext \
--longread { path/to/longread/fasta/ } \
--longread_type { default is "hifi" }
--sample { default is "pretext_rerun" } \
--teloseq { deafault is "TTAGGG" } \
--teloseq { default is "TTAGGG" } \
--map_order { default is "unsorted" } \
--outdir { OUTDIR } \
-profile <docker/singularity/{institute}>

Expand All @@ -81,7 +86,8 @@ nextflow run sanger-tol/curationpretext \
--longread { path/to/longread/fasta/ } \
--longread_type { default is "hifi" }
--sample { default is "pretext_rerun" } \
--teloseq { deafault is "TTAGGG" } \
--teloseq { default is "TTAGGG" } \
--map_order { default is "unsorted" } \
--outdir { OUTDIR } \
-profile <docker/singularity/{institute}> \
-entry MAPS_ONLY \
Expand Down
Binary file removed bin/find_telomere
Binary file not shown.
4 changes: 2 additions & 2 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ process {
}

withName: PRETEXTMAP_STANDRD {
ext.args = { "--sortby length --mapq 0 --memory ${task.memory.giga}G" }
ext.args = { "${meta.map_order.equals("length") ? "--sortby length": "--sortby nosort" } --mapq 0 --memory ${task.memory.giga}" }
ext.prefix = { "${meta.id}_normal_pi" }
}

withName: PRETEXTMAP_HIGHRES {
ext.args = { "--sortby length --highRes --mapq 0 --memory ${task.memory.giga}G" }
ext.args = { "${meta.map_order.equals("length") ? "--sortby length": "--sortby nosort" } --highRes --mapq 0" }
ext.prefix = { "${meta.id}_hr_pi" }
}

Expand Down
2 changes: 1 addition & 1 deletion modules/local/find_telomere_regions.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process FIND_TELOMERE_REGIONS {
tag "${meta.id}"
label 'process_low'

container 'docker.io/library/gcc:7.1.0'
container 'quay.io/sanger-tol/telomere:0.0.1-c1'

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
Expand Down
1 change: 1 addition & 0 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ params {
cram = null
aligner = "bwamem2"
longread_type = "hifi"
map_order = "unsorted"

// Boilerplate options
outdir = "${params.outdir}/results"
Expand Down
8 changes: 7 additions & 1 deletion nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"type": "object",
"fa_icon": "fas fa-terminal",
"description": "Define where the pipeline should find input data and save output data.",
"required": ["input", "cram", "sample", "outdir"],
"required": ["input", "cram", "sample", "outdir", "map_order"],
"properties": {
"input": {
"type": "string",
Expand Down Expand Up @@ -46,6 +46,12 @@
"help_text": "Give me a telomeric motif",
"fa_icon": "fas fa-file-signature"
},
"map_order": {
"type": "string",
"description": "HiC map scaffold order. Default to unsorted",
"help_text": "How you want to display your hic map, sorted by length?",
"fa_icon": "fas fa-file-signature"
},
"aligner": {
"type": "string",
"description": "Aligner for use {minimap2, bwamem2} in generating map",
Expand Down
1 change: 1 addition & 0 deletions subworkflows/local/generate_maps.nf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ workflow GENERATE_MAPS {
reference_tuple // Channel [ val(meta), path(file) ]
hic_reads_path // Channel [ val(meta), path(directory) ]


main:
ch_versions = Channel.empty()

Expand Down
Loading