Fixed bug and tests.

Author: japdlsd

meta.yaml

@@ -1,6 +1,6 @@
 package:
     name: "mcdp2"
-    version: "0.0.1"
+    version: "0.0.2"
 
 source:
     path: .
@@ -38,4 +38,4 @@ test:
         - "src/tests/mcdp2/*/*.py"
 
 about:
-    summary: "A tool to compute p-values for number of overlaps between two genome annotations"
+    summary: "A tool to compute p-values for number of overlaps between two genome annotations"

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name="mcdp2",
-    version="0.0.1",
+    version="0.0.2",
     author="Askar Gafurov",
     author_email="[email protected]",
     license="MIT License",
@@ -34,4 +34,4 @@
         'scipy',
     ],
     ext_modules=ext_modules
-)
+)

src/mcdp2/common/io.py

@@ -332,11 +332,11 @@ class Event(IntEnum):
     for c, b, e in masking_intervals:
         events.append((c, b, Event.BEGIN))
         events.append((c, e, Event.END))
-    for c, l in chromosome_lengths.items():
+    for c, l in chromosome_lengths:
         events.append((c, 0, Event.CBEGIN))
         events.append((c, l, Event.CEND))
 
-    result = {c: [] for c in chromosome_lengths}
+    result = {chr_name: [] for chr_name, chr_length in chromosome_lengths}
     prev_position = None
 
     print(events, file=sys.stderr)

src/tests/mcdp2/common/test_io.py

@@ -173,10 +173,10 @@ def test_make_context_intervals_from_records(records, ignore_blocks, expected):
 
 
 @pytest.mark.parametrize("intervals,chromosome_lengths,expected", [
-    ([], {'c1': 10}, {'c1': [('c1_unmasked', 0, 10)]}),
-    ([], {'c1': 10, 'c2': 20},
+    ([], [('c1', 10)], {'c1': [('c1_unmasked', 0, 10)]}),
+    ([], [('c1', 10), ('c2', 20)],
      {'c1': [('c1_unmasked', 0, 10)], 'c2': [('c2_unmasked', 0, 20)]}),
-    ([('c1', 3, 8)], {'c1': 10, 'c2': 20},
+    ([('c1', 3, 8)], [('c1', 10), ('c2', 20)],
      {'c1': [('c1_unmasked', 0, 3), ('c1_masked', 3, 8), ('c1_unmasked', 8, 10)], 'c2': [('c2_unmasked', 0, 20)]}),
 ])
 def test_create_context_from_masking(intervals, chromosome_lengths, expected):