diff --git a/.travis.yml b/.travis.yml index b77371b03dae59b22b900792fe7f76b2d07faab1..0441f8fcce9a679b7983b55760d2b0a392403a1c 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 7fbde06d5f4879565af04b15ee2ec48f71e4ac14..8b6ee9bd3e6a0ed64f6177ebc19fa01c4a98ea4b 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 1c253c2947f2a3b7a6b766fa1fd3ead35219188c..4d9c20c6f453b34120ddca1732375c2e538e1584 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