Merge branch 'master' into feature/download_retry

modules/nextflow/src/main/groovy/nextflow/cloud/aws/batch/AwsOptions.groovy

@@ -37,7 +37,7 @@ class AwsOptions {
     static final public int MAX_TRANSFER_ATTEMPTS = 1
 
     static final public int DEFAULT_DELAY_BETWEEN_ATTEMPTS = 10
-
+  
     String cliPath
 
     String storageClass
@@ -50,10 +50,6 @@ class AwsOptions {
 
     int maxParallelTransfers = MAX_TRANSFER
 
-    int maxTransferAttempts = MAX_TRANSFER_ATTEMPTS
-
-    int delayBetweenAttempts = DEFAULT_DELAY_BETWEEN_ATTEMPTS
-
     /**
      * The job role ARN that should be used
      */

tests/.travis.yml

@@ -1,9 +1,15 @@
+sudo: required
 language: java
 jdk:
 - oraclejdk8
-before_install:
+services:
+  - docker
+env:
+  global:
+  - NXF_ANSI_LOG=false
+install:
 - sudo apt-get -qq update
-- sudo apt-get -qq -y install graphviz
+- sudo apt-get -qq -y install graphviz realpath
 - sudo pip install awscli
 git:
   submodules: false
@@ -12,8 +18,8 @@ branches:
   - master  
 before_script:
 - rm $HOME/.gitconfig
-- mkdir "$HOME/.nextflow" && echo "providers.github.auth='$NXF_GITHUB_ACCESS_TOKEN'" > "$HOME/.nextflow/scm"
-script:
+- mkdir -p "$HOME/.nextflow" && echo "providers.github.auth='$NXF_GITHUB_ACCESS_TOKEN'" > "$HOME/.nextflow/scm"
 - curl -fsSL get.nextflow.io | bash
 - docker pull nextflow/examples
+script:
 - export WITH_DOCKER='-with-docker'; export NXF_CMD=$PWD/nextflow; cd checks/ && bash run.sh 

tests/opt-file.nf

@@ -16,17 +16,19 @@
  */
 
 process foo {
-  output: file 'missing.txt' optional true into result
+  output: 
+  file 'missing.txt' optional true into result
 
   '''
   echo miao
   '''
 }
 
 process bar {
-	input: file x from result
+  input: 
+  file x from result
 
-	'''
-	echo bau
-	'''
+  '''
+  echo bau
+  '''
 }