Merge branch 'release/1.2.0'

* Added json config paramter to accept filtering paramaters * removed commandline paramaters that are now read from config file
cancerit · Mar 31, 2021 · e158cf4 · e158cf4
2 parents 31b5a3d + 3572fb3
commit e158cf4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+
+## 1.2.0
+* Added json config paramter to accept filtering paramaters
+* removed commandline paramaters that are now read from config file
 ## 1.1.4
 * updated regex to get genename
 ## 1.1.3

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ USER root
 
 MAINTAINER  [email protected]
 
-ENV ANNOTATEVCF_VER '1.1.4'
+ENV ANNOTATEVCF_VER '1.2.0'
 
 # install system tools
 RUN apt-get -yq update
@@ -40,7 +40,7 @@ RUN pip3 install --install-option="--prefix=$CGP_OPT/python-lib" dist/$(ls -1 di
 FROM ubuntu:20.04
 
 LABEL uk.ac.sanger.cgp="Cancer Genome Project, Wellcome Sanger Institute" \
-      version="1.0.0" \
+      version="1.2.0" \
       description="Tool to perform vcf file annotation"
 
 ### security upgrades and cleanup

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 
 config = {
-    'version': '1.1.4',
+    'version': '1.2.0',
     'name': 'annotateVcf',
     'description': 'Tool to annotate and filter vcf files...',
     'author': 'Shriram Bhosle',