Skip to content

Commit

Permalink
Merge pull request #51 from sk-sahu/dev
Browse files Browse the repository at this point in the history
For minor release V1.1
  • Loading branch information
apeltzer authored Mar 24, 2021
2 parents f09f012 + 04a3513 commit d19e818
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ jobs:
- name: Build new docker image
if: env.MATCHED_FILES
run: docker build --no-cache . -t nfcore/scrnaseq:dev
run: docker build --no-cache . -t nfcore/scrnaseq:1.1.0

- name: Pull docker image
if: ${{ !env.MATCHED_FILES }}
run: |
docker pull nfcore/scrnaseq:dev
docker tag nfcore/scrnaseq:dev nfcore/scrnaseq:dev
docker tag nfcore/scrnaseq:dev nfcore/scrnaseq:1.1.0
- name: Install Nextflow
env:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v1.1.0 - 2021-03-24 "Olive Mercury Corgi"

* Template update with latest nf-core/tools v1.13.2
* Parameters JSON Schema added [#42](https://github.com/nf-core/scrnaseq/issues/42)

## V1.0.1dev

* [25](https://github.com/nf-core/scrnaseq/issues/25) Fix small documentation error with wrong parameter for txp2gene
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN conda env create --quiet -f /environment.yml && conda clean -a
RUN apt-get update && apt-get install -y libtbb2 pandoc-citeproc

# Add conda installation dir to PATH (instead of doing 'conda activate')
ENV PATH /opt/conda/envs/nf-core-scrnaseq-1.0.1dev/bin:$PATH
ENV PATH /opt/conda/envs/nf-core-scrnaseq-1.1.0/bin:$PATH

# Dump the details of the installed packages to a file for posterity
RUN conda env export --name nf-core-scrnaseq-1.0.1dev > nf-core-scrnaseq-1.0.1dev.yml
RUN conda env export --name nf-core-scrnaseq-1.1.0 > nf-core-scrnaseq-1.1.0.yml
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# You can use this file to create a conda environment for this pipeline:
# conda env create -f environment.yml
name: nf-core-scrnaseq-1.0.1dev
name: nf-core-scrnaseq-1.1.0
channels:
- conda-forge
- bioconda
Expand Down
4 changes: 2 additions & 2 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ params {

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

// Load base.config by default for all pipelines
includeConfig 'conf/base.config'
Expand Down Expand Up @@ -172,7 +172,7 @@ manifest {
description = 'Pipeline for processing of 10xGenomics single cell rnaseq data'
mainScript = 'main.nf'
nextflowVersion = '>=20.10.0'
version = '1.0.1dev'
version = '1.1.0'
}

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

0 comments on commit d19e818

Please sign in to comment.