Merge branch 'rls_prep' into 'dev'

bump version and update changelog See merge request research/medaka!401
nanoporetech · May 4, 2020 · 6298439 · 6298439
2 parents f87da1d + 8264996
commit 6298439
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+v1.0.0
+-------
+Models, features and fixes release
+
+* Consensus models for Guppy 3.6.0.
+* Add functionality for auto-download of older models.
+* Fix to methylation aggregation.
+* VCF annotation tool.
+
+
 v0.12.1
 -------
 Minor release harmonising versions of htslib/samtools dependencies.

diff --git a/medaka/__init__.py b/medaka/__init__.py
@@ -4,7 +4,7 @@
 import os
 import subprocess
 
-__version__ = 'v0.12.2-rc.1'
+__version__ = '1.0.0'
 
 
 def check_minimap2_version():

diff --git a/medaka/data/r941_min_fast_g344_model.hdf5 b/medaka/data/r941_min_fast_g344_model.hdf5
diff --git a/medaka/data/r941_prom_fast_g344_model.hdf5 b/medaka/data/r941_prom_fast_g344_model.hdf5
diff --git a/medaka/options.py b/medaka/options.py
@@ -30,10 +30,8 @@
     'r103_prom_snp_g3210', 'r103_prom_variant_g3210']
 archived_models = [
     # r9 consensus
-    'r941_min_fast_g303', 'r941_min_fast_g344',
-    'r941_min_high_g303', 'r941_min_high_g330',
-    'r941_prom_fast_g303', 'r941_prom_fast_g344',
-    'r941_prom_high_g303', 'r941_prom_high_g330',
+    'r941_min_fast_g303', 'r941_min_high_g303', 'r941_min_high_g330',
+    'r941_prom_fast_g303', 'r941_prom_high_g303', 'r941_prom_high_g330',
     # r10 consensus
     'r10_min_high_g303', 'r10_min_high_g340',
     # snp and variant