Skip to content

Commit 37f5930

Browse files
committed
Release version bump
1 parent 0ff78c5 commit 37f5930

7 files changed

Lines changed: 13 additions & 14 deletions

File tree

.github/workflows/awsfulltest.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
- name: Install awscli
2424
run: conda install -c conda-forge awscli
2525
- name: Start AWS batch job
26-
# TODO nf-core: You can customise AWS full pipeline tests as required
2726
# Add full size test data (but still relatively small datasets for few samples)
2827
# on the `test_full.config` test runs with only one set of parameters
2928
# Then specify `-profile test_full` instead of `-profile test` on the AWS batch command

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ jobs:
3434
3535
- name: Build new docker image
3636
if: env.MATCHED_FILES
37-
run: docker build --no-cache . -t nfcore/eager:dev
37+
run: docker build --no-cache . -t nfcore/eager:2.2.2
3838

3939
- name: Pull docker image
4040
if: ${{ !env.MATCHED_FILES }}
4141
run: |
4242
docker pull nfcore/eager:dev
43-
docker tag nfcore/eager:dev nfcore/eager:dev
43+
docker tag nfcore/eager:dev nfcore/eager:2.2.2
4444
4545
- name: Install Nextflow
4646
env:

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
55

6-
## [2.2.2dev] - Unreleased
6+
## [2.2.2] - 2020-12-03
77

88
### `Added`
99

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1616
- [#602](https://github.com/nf-core/eager/issues/602) - Added the newly avaliable GATK 3.5 conda package.
1717
- [#610](https://github.com/nf-core/eager/issues/610) - Create bwa_index channel when specifying circularmapper as mapper
1818
- Updated template to nf-core/tools 1.12
19+
- General documentation improvements
1920

2021
### `Deprecated`
2122

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ COPY environment.yml /
77
RUN conda env create --quiet -f /environment.yml && conda clean -a
88

99
# Add conda installation dir to PATH (instead of doing 'conda activate')
10-
ENV PATH /opt/conda/envs/nf-core-eager-2.2.2dev/bin:$PATH
10+
ENV PATH /opt/conda/envs/nf-core-eager-2.2.2/bin:$PATH
1111

1212
# Dump the details of the installed packages to a file for posterity
13-
RUN conda env export --name nf-core-eager-2.2.2dev > nf-core-eager-2.2.2dev.yml
13+
RUN conda env export --name nf-core-eager-2.2.2 > nf-core-eager-2.2.2.yml
1414

1515
# Instruct R processes to use these empty files instead of clashing with a local version
1616
RUN touch .Rprofile

bin/scrape_software_versions.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from collections import OrderedDict
44
import re
55

6-
# TODO nf-core: Add additional regexes for new tools in process get_software_versions
76
regexes = {
87
"nf-core/eager": ["v_pipeline.txt", r"(\S+)"],
98
"Nextflow": ["v_nextflow.txt", r"(\S+)"],

environment.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
name: nf-core-eager-2.2.2dev
1+
name: nf-core-eager-2.2.2
22
channels:
33
- conda-forge
44
- bioconda
55
- defaults
66
dependencies:
77
- conda-forge::python=3.7.3
8-
- conda-forge::markdown=3.2.2 #Dont upgrade anymore
8+
- conda-forge::markdown=3.2.2 #Don't upgrade anymore
99
- conda-forge::pymdown-extensions=7.1
1010
- conda-forge::pygments=2.6.1
1111
- bioconda::rename=1.601
12-
- conda-forge::openjdk=8.0.144
12+
- conda-forge::openjdk=8.0.144 # Don't upgrade - required for GATK
1313
- bioconda::fastqc=0.11.9
1414
- bioconda::adapterremoval=2.3.1
1515
- bioconda::adapterremovalfixprefix=0.0.5
@@ -20,10 +20,10 @@ dependencies:
2020
- bioconda::angsd=0.933
2121
- bioconda::circularmapper=1.93.5
2222
- bioconda::gatk4=4.1.7.0
23-
- bioconda::gatk=3.5
23+
- bioconda::gatk=3.5 ## Don't upgrade - required for MultiVCFAnalyzer
2424
- bioconda::qualimap=2.2.2d
2525
- bioconda::vcf2genome=0.91
26-
- bioconda::damageprofiler=0.4.9
26+
- bioconda::damageprofiler=0.4.9 # Don't upgrade - later versions don't allow java 8
2727
- bioconda::multiqc=1.9
2828
- bioconda::pmdtools=0.60
2929
- bioconda::bedtools=2.29.2

nextflow.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ params {
243243

244244
// Container slug. Stable releases should specify release tag!
245245
// Developmental code should specify :dev
246-
process.container = 'nfcore/eager:dev'
246+
process.container = 'nfcore/eager:2.2.2'
247247

248248
// Load base.config by default for all pipelines
249249
includeConfig 'conf/base.config'
@@ -337,7 +337,7 @@ manifest {
337337
description = 'A fully reproducible and state-of-the-art ancient DNA analysis pipeline'
338338
mainScript = 'main.nf'
339339
nextflowVersion = '!>=20.04.0'
340-
version = '2.2.2dev'
340+
version = '2.2.2'
341341
}
342342

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

0 commit comments

Comments
 (0)