Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -9,10 +9,6 @@ cache: pip
 matrix:
   fast_finish: true
 
-before_install:
-  # PRs to master are only ok if coming from dev branch
-  - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && [ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ])'
-
 install:
   # Install Nextflow
   - mkdir /tmp/nextflow && cd /tmp/nextflow
@@ -26,4 +22,8 @@ env:
 
 script:
   # Run the pipeline with the test profile and test remote config
-  - grep "{.*includeConfig.*[a-z]*\.config\"" ${TRAVIS_BUILD_DIR}/nfcore_custom.config | tr -s ' ' | cut -d " " -f 2 | xargs -I {} nextflow run ${TRAVIS_BUILD_DIR}/configtest.nf -profile {}
+  - |
+      grep "{.*includeConfig.*[a-z]*\.config\"" ${TRAVIS_BUILD_DIR}/nfcore_custom.config | \
+      tr -s ' ' | \
+      cut -d " " -f 2 | \
+      xargs -I {} nextflow run ${TRAVIS_BUILD_DIR}/configtest.nf -profile {}

README.md

@@ -48,7 +48,6 @@ Alternatively, instead of using the configuration profiles from this repository,
 pipeline directly calling the single institutional config file that you need with the `-c` parameter.
 
 ```bash
-## Example command for nf-core/rnaseq
 nextflow run /path/to/pipeline/ -c /path/to/my/configs/configs-master/conf/my_config.config
 ```