Skip to content
Snippets Groups Projects
Commit 154616a3 authored by nservant's avatar nservant
Browse files

fix bug in travis

parent 322c97ac
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ before_install: ...@@ -13,7 +13,7 @@ before_install:
# Pull the docker image first so the test doesn't wait for this # Pull the docker image first so the test doesn't wait for this
- docker pull nfcore/hic:dev - docker pull nfcore/hic:dev
# Fake the tag locally so that the pipeline runs properly # Fake the tag locally so that the pipeline runs properly
- docker tag nfcore/hic:dev nfcore/hic:latest - docker tag nfcore/hic:dev nfcore/hic:dev
install: install:
# Install Nextflow # Install Nextflow
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
process { process {
container = params.container container = process.container
cpus = { check_max( 2, 'cpus' ) } cpus = { check_max( 2, 'cpus' ) }
memory = { check_max( 8.GB * task.attempt, 'memory' ) } memory = { check_max( 8.GB * task.attempt, 'memory' ) }
......
...@@ -4,9 +4,10 @@ channels: ...@@ -4,9 +4,10 @@ channels:
- bioconda - bioconda
- defaults - defaults
dependencies: dependencies:
- python=2.7.11 - python=2.7.13
- conda-forge::scipy=1.0.1 - conda-forge::scipy=1.0.1
- conda-forge::numpy=1.9.3 - conda-forge::numpy=1.9.3
- conda-forge::r-markdown=0.9
- bcbio::bx-python=0.7.3 - bcbio::bx-python=0.7.3
- bioconda::pysam=0.14.1 - bioconda::pysam=0.14.1
- cooler=0.8.3 - cooler=0.8.3
......
...@@ -11,11 +11,6 @@ ...@@ -11,11 +11,6 @@
// Global default params, used in configs // Global default params, used in configs
params { params {
// Container slug. Stable releases should specify release tag!
// Developmental code should specify :latest
//container = 'nfcore/hic:latest'
container = 'nfcore/hic:latest'
// Workflow flags // Workflow flags
// TODO nf-core: Specify your pipeline's command line flags // TODO nf-core: Specify your pipeline's command line flags
reads = "*{1,2}.fastq.gz" reads = "*{1,2}.fastq.gz"
...@@ -42,6 +37,7 @@ params { ...@@ -42,6 +37,7 @@ params {
custom_config_version = 'master' custom_config_version = 'master'
} }
process.container = 'nfcore/hic:dev'
// Load base.config by default for all pipelines // Load base.config by default for all pipelines
includeConfig 'conf/base.config' includeConfig 'conf/base.config'
...@@ -57,14 +53,8 @@ profiles { ...@@ -57,14 +53,8 @@ profiles {
awsbatch { includeConfig 'conf/awsbatch.config' } awsbatch { includeConfig 'conf/awsbatch.config' }
conda { process.conda = "$baseDir/environment.yml" } conda { process.conda = "$baseDir/environment.yml" }
debug { process.beforeScript = 'echo $HOSTNAME' } debug { process.beforeScript = 'echo $HOSTNAME' }
docker { docker { docker.enabled = true }
docker.enabled = true singularity { singularity.enabled = true }
process.container = params.container
}
singularity {
singularity.enabled = true
process.container = {"shub://${params.container.replace('nfcore', 'nf-core')}"}
}
test { includeConfig 'conf/test.config' } test { includeConfig 'conf/test.config' }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment