From 23163c87df2c8e1af3fedb6eb0241e81abd140c9 Mon Sep 17 00:00:00 2001
From: nservant <nservant@curie.fr>
Date: Fri, 11 Oct 2019 22:53:56 +0200
Subject: [PATCH] lint 1.7
---
.travis.yml | 3 +--
Dockerfile | 2 +-
environment.yml | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b77371b..0441f8f 100644
--- a/.travis.yml
+++ b/.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
diff --git a/Dockerfile b/Dockerfile
index 7fbde06..8b6ee9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nfcore/base
+FROM nfcore/base:1.7
LABEL authors="Nicolas Servant" \
description="Docker image containing all requirements for nf-core/hic pipeline"
diff --git a/environment.yml b/environment.yml
index 1c253c2..4d9c20c 100644
--- a/environment.yml
+++ b/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
--
GitLab