[med-svn] [Git][med-team/cyvcf2][master] 5 commits: Fix watchfile to detect new versions on github

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / cyvcf2


Commits:
f3683806 by Andreas Tille at 2022-05-02T12:02:48+02:00
Fix watchfile to detect new versions on github

- - - - -
90ed00e3 by Andreas Tille at 2022-05-02T12:02:51+02:00
New upstream version 0.30.15
- - - - -
facbcc3f by Andreas Tille at 2022-05-02T12:02:51+02:00
routine-update: New upstream version

- - - - -
f373406d by Andreas Tille at 2022-05-02T12:02:52+02:00
Update upstream source from tag 'upstream/0.30.15'

Update to upstream version '0.30.15'
with Debian dir 681423d898dd406708bdf9192c1420feab309020
- - - - -
ce889c33 by Andreas Tille at 2022-05-02T12:05:01+02:00
routine-update: Ready to upload to unstable

- - - - -


6 changed files:

- CHANGES.md
- cyvcf2/__init__.py
- cyvcf2/cyvcf2.pyx
- cyvcf2/tests/test_reader.py
- debian/changelog
- debian/watch


Changes:

=====================================
CHANGES.md
=====================================
@@ -1,3 +1,6 @@
+# v0.30.15
++ fix num_unknown when gts012=True (#236)
+
 # v0.30.14
 + use warnings instead of sys.stderr (#229 from @grahamgower)
 + use libdeflate in wheel build (#231 from @grahamgower)


=====================================
cyvcf2/__init__.py
=====================================
@@ -2,4 +2,4 @@ from .cyvcf2 import (VCF, Variant, Writer, r_ as r_unphased, par_relatedness,
                      par_het)
 Reader = VCFReader = VCF
 
-__version__ = "0.30.14"
+__version__ = "0.30.15"


=====================================
cyvcf2/cyvcf2.pyx
=====================================
@@ -1274,9 +1274,9 @@ cdef class Variant(object):
             if self._gt_types == NULL:
                 self.gt_types
             cdef int n = 0, i = 0
+            cdef int unknown = 3 if self.vcf.gts012 else 2
             for i in range(self.vcf.n_samples):
-                if self._gt_types[i] == 2:
-                    n+=1
+                n += (self._gt_types[i] == unknown)
             return n
 
     property FORMAT:


=====================================
cyvcf2/tests/test_reader.py
=====================================
@@ -1302,3 +1302,17 @@ def test_genotypes():
             a = v.genotype.array()[0] # only 0'th item
             print("i:", i, " a:", v.genotype.array()[0], " exp:", exp_array[i])
             assert (a == exp_array[i]).all(), " error with array"
+
+def test_issue236():
+
+
+    for strict_gt in (False, True):
+        res = [[], []]
+
+        for gts in (False, True):
+            vcf = VCF(os.path.join(HERE, "test-genotypes.vcf"), gts012=gts, strict_gt=strict_gt)
+            for v in vcf:
+                res[int(gts)].append(v.num_unknown)
+
+        assert res[0] == res[1]
+        assert len(res[0]) > 0


=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+cyvcf2 (0.30.15-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version
+
+ -- Andreas Tille <tille at debian.org>  Mon, 02 May 2022 12:03:00 +0200
+
+cyvcf2 (0.30.14-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix watchfile to detect new versions on github
+
+ -- Andreas Tille <tille at debian.org>  Mon, 02 May 2022 12:02:48 +0200
+
 cyvcf2 (0.30.14-1) unstable; urgency=medium
 
   * New upstream version 0.30.14


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
 version=4
 
-https://github.com/brentp/cyvcf2/tags .*/archive/.*/v?@ANY_VERSION@@ARCHIVE_EXT@
+https://github.com/brentp/cyvcf2/tags .*/.*/v?@ANY_VERSION@@ARCHIVE_EXT@



View it on GitLab: https://salsa.debian.org/med-team/cyvcf2/-/compare/bebf5620f7461c90b52eece28f88592e5b5073c0...ce889c33d95490bedf1135e5a6bbe9e83cf6c388

-- 
View it on GitLab: https://salsa.debian.org/med-team/cyvcf2/-/compare/bebf5620f7461c90b52eece28f88592e5b5073c0...ce889c33d95490bedf1135e5a6bbe9e83cf6c388
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220502/3486011c/attachment-0001.htm>