lint 1.7

.travis.yml

@@ -8,8 +8,7 @@ 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" ])'
+  - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && ([ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ] || [ $TRAVIS_PULL_REQUEST_BRANCH = "patch" ]))'
   # Pull the docker image first so the test doesn't wait for this
   - docker pull nfcore/hic:dev
   # Fake the tag locally so that the pipeline runs properly

Dockerfile

-FROM nfcore/base
+FROM nfcore/base:1.7
 LABEL authors="Nicolas Servant" \
       description="Docker image containing all requirements for nf-core/hic pipeline"
 

environment.yml

@@ -12,7 +12,7 @@ dependencies:
   - numpy=1.16.3
   - r-markdown=0.9
   - bx-python=0.8.2     
-  - bioconda::pysam=0.15.2
+  - pysam=0.15.2
   - cooler=0.8.5
   - bowtie2=2.3.5
   - samtools=1.9