Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump version number for v1.4.1 release #130

Merged
merged 2 commits into from
Dec 5, 2019
Merged

Bump version number for v1.4.1 release #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0152bca
Bump version number for v1.4.1 release
ewels Dec 4, 2019
2244d3a
Add Python 3.7 back as a dependency
ewels Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ matrix:

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_BRANCH = "patch" ]))'
- '[ $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/methylseq:dev
# Fake the tag locally so that the pipeline runs properly
# Looks weird when this is :dev to :dev, but makes sense when testing code for a release (:dev to :1.0.1)
- docker tag nfcore/methylseq:dev nfcore/methylseq:dev
- docker tag nfcore/methylseq:dev nfcore/methylseq:1.4.1

install:
# Install Nextflow
Expand All @@ -28,7 +28,7 @@ install:
- mkdir ${TRAVIS_BUILD_DIR}/tests && cd ${TRAVIS_BUILD_DIR}/tests
# Install markdownlint-cli
- sudo apt-get install npm && npm install -g markdownlint-cli

env:
- ALIGNER=bismark ALIGNER_REF="--bismark_index ${TRAVIS_BUILD_DIR}/tests/results/reference_genome/BismarkIndex/" NXF_VER='19.04.0'
- ALIGNER=bismark ALIGNER_REF="--bismark_index ${TRAVIS_BUILD_DIR}/tests/results/reference_genome/BismarkIndex/"
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# nf-core/methylseq

## 1.5dev
## [v1.4.1](https://github.com/nf-core/methylseq/releases/tag/1.4.1) - 2019-12-05

### New features

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ LABEL authors="Phil Ewels" \

COPY environment.yml /
RUN conda env create -f /environment.yml && conda clean -a
RUN conda env export --name nf-core-methylseq-1.5dev > nf-core-methylseq-1.5dev.yml
ENV PATH /opt/conda/envs/nf-core-methylseq-1.5dev/bin:$PATH
RUN conda env export --name nf-core-methylseq-1.4.1 > nf-core-methylseq-1.4.1.yml
ENV PATH /opt/conda/envs/nf-core-methylseq-1.4.1/bin:$PATH
3 changes: 2 additions & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# You can use this file to create a conda environment for this pipeline:
# conda env create -f environment.yml
name: nf-core-methylseq-1.5dev
name: nf-core-methylseq-1.4.1
channels:
- conda-forge
- bioconda
- defaults
dependencies:
- python=3.7
- conda-forge::pigz=2.3.4
- conda-forge::r-markdown=1.1
- bioconda::fastqc=0.11.8
Expand Down
4 changes: 2 additions & 2 deletions nextflow.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ params {

// Container slug. Stable releases should specify release tag!
// Developmental code should specify :dev
process.container = 'nfcore/methylseq:dev'
process.container = 'nfcore/methylseq:1.4.1'

// Load base.config by default for all pipelines
includeConfig 'conf/base.config'
Expand Down Expand Up @@ -127,7 +127,7 @@ manifest {
description = 'Methylation (Bisulfite-Sequencing) Best Practice analysis pipeline, part of the nf-core community.'
mainScript = 'main.nf'
nextflowVersion = '>=19.04.0'
version = '1.5dev'
version = '1.4.1'
}

// Function to ensure that resource requirements don't go beyond
Expand Down