Skip to content
This repository has been archived by the owner on Mar 10, 2023. It is now read-only.

Commit

Permalink
Merge pull request #110 from nf-core/template_merge
Browse files Browse the repository at this point in the history
Template merge
  • Loading branch information
ewels authored Oct 21, 2020
2 parents b1e714f + b9094f1 commit e1f736c
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 22 deletions.
1 change: 0 additions & 1 deletion .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ jobs:
Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ jobs:
- name: Run pipeline with various parameters
run: |
nextflow run ${GITHUB_WORKSPACE} -profile docker,${{ matrix.profile_flags }}
nextflow run ${GITHUB_WORKSPACE} -profile docker,${{ matrix.profile_flags }}
1 change: 0 additions & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,3 @@ jobs:
with:
name: linting-log-file
path: lint_log.txt

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ results/
.DS_Store
tests/
testing/
*.pyc
*.pyc
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ RUN pip show sencha
RUN sourmash info
RUN bam2fasta info
RUN sencha index --help
RUN sencha translate --help
RUN sencha translate --help
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
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.
SOFTWARE.
2 changes: 1 addition & 1 deletion assets/email_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ <h3>Pipeline Configuration:</h3>
</div>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion conf/base.config
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ params {
max_memory = 128.GB
max_cpus = 16
max_time = 240.h
}
}
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ dependencies:
- ripgrep=12.1.1
- pip:
- bam2fasta==1.0.8
- sencha==1.0.3
- sencha==1.0.3
24 changes: 12 additions & 12 deletions main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -1049,20 +1049,20 @@ if ( have_nucleotide_input ) {

if (params.subsample) {
process subsample_input {
tag "${id}_subsample"
publishDir "${params.outdir}/seqtk/", mode: 'copy'
tag "${id}_subsample"
publishDir "${params.outdir}/seqtk/", mode: 'copy'

input:
set val(id), file(reads) from subsample_ch_reads_for_ribosomal_removal
input:
set val(id), file(reads) from subsample_ch_reads_for_ribosomal_removal

output:
set val(id), file("*_${params.subsample}.fastq.gz") into ch_reads_for_ribosomal_removal
output:
set val(id), file("*_${params.subsample}.fastq.gz") into ch_reads_for_ribosomal_removal

script:
read1 = reads[0]
read2 = reads[1]
read1_prefix = read1.simpleName
read2_prefix = read2.simpleName
script:
read1 = reads[0]
read2 = reads[1]
read1_prefix = read1.simpleName
read2_prefix = read2.simpleName

"""
seqtk sample -s100 ${read1} ${params.subsample} > ${read1_prefix}_${params.subsample}.fastq.gz
Expand Down Expand Up @@ -1631,4 +1631,4 @@ def checkHostname() {
}
}
}
}
}
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -216,4 +216,4 @@ def check_max(obj, type) {
return obj
}
}
}
}

0 comments on commit e1f736c

Please sign in to comment.