Merge pull request #170 from bcgsc/develop

Release v2.1.7 scope review
bcgsc · Dec 4, 2018 · 667534f · 667534f
2 parents 8e35742 + c737eb9
commit 667534f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/mavis/constants.py b/mavis/constants.py
@@ -652,7 +652,9 @@ def _match_ambiguous_dna(x, y):
 
 GIEMSA_STAIN = MavisNamespace(
     GNEG='gneg',
+    GPOS33='gpos33',
     GPOS50='gpos50',
+    GPOS66='gpos66',
     GPOS75='gpos75',
     GPOS25='gpos25',
     GPOS100='gpos100',

diff --git a/mavis/illustrate/constants.py b/mavis/illustrate/constants.py
@@ -153,13 +153,15 @@ def __init__(
         self.legend_border_stroke_width = 1
 
         self.template_band_stroke_width = 0.5
-        temp = [c.hex for c in Color('#ffffff').range_to(Color('#000000'), 5)]
+        temp = [c.hex for c in Color('#ffffff').range_to(Color('#000000'), 7)]
         self.template_band_fill = {
             GIEMSA_STAIN.ACEN: '#800000',
             GIEMSA_STAIN.GPOS25: temp[1],
-            GIEMSA_STAIN.GPOS50: temp[2],
-            GIEMSA_STAIN.GPOS75: temp[3],
-            GIEMSA_STAIN.GPOS100: temp[4],
+            GIEMSA_STAIN.GPOS33: temp[2],
+            GIEMSA_STAIN.GPOS50: temp[3],
+            GIEMSA_STAIN.GPOS66: temp[4],
+            GIEMSA_STAIN.GPOS75: temp[5],
+            GIEMSA_STAIN.GPOS100: temp[6],
             GIEMSA_STAIN.GNEG: '#ffffff'
         }
         self.template_band_stroke = '#000000'

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 import re
 
 
-VERSION = '2.1.6'
+VERSION = '2.1.7'
 
 
 def parse_md_readme():