[med-svn] [Git][med-team/python-py2bit][master] 4 commits: New upstream version 0.3.2

Étienne Mollier (@emollier) gitlab at salsa.debian.org
Mon Nov 18 18:52:32 GMT 2024



Étienne Mollier pushed to branch master at Debian Med / python-py2bit


Commits:
2d49dd5d by Étienne Mollier at 2024-11-18T19:50:17+01:00
New upstream version 0.3.2
- - - - -
05043edb by Étienne Mollier at 2024-11-18T19:50:18+01:00
Update upstream source from tag 'upstream/0.3.2'

Update to upstream version '0.3.2'
with Debian dir 239c5f3724a3173a5ffd66a2a27d0b20feaf2d63
- - - - -
08751942 by Étienne Mollier at 2024-11-18T19:51:08+01:00
gcc-14.patch: delete: applied upstream.

- - - - -
436e1c7a by Étienne Mollier at 2024-11-18T19:51:52+01:00
d/changelog: ready for upload to unstable.

- - - - -


10 changed files:

- azure-pipelines.yml
- debian/changelog
- − debian/patches/gcc-14.patch
- debian/patches/series
- lib2bit/2bit.c
- py2bit.c
- py2bit.h
- py2bitTest/test.py
- setup.cfg
- setup.py


Changes:

=====================================
azure-pipelines.yml
=====================================
@@ -8,16 +8,14 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
-      Python36:
-        python.version: '3.6'
-      Python37:
-        python.version: '3.7'
       Python38:
         python.version: '3.8'
       Python39:
         python.version: '3.9'
       Python310:
         python.version: '3.10'
+      Python311:
+        python.version: '3.11'
     maxParallel: 5
 
   steps:


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+python-py2bit (0.3.2-1) unstable; urgency=medium
+
+  * New upstream version 0.3.2
+  * gcc-14.patch: delete: applied upstream.
+
+ -- Étienne Mollier <emollier at debian.org>  Mon, 18 Nov 2024 19:51:44 +0100
+
 python-py2bit (0.3.1-3) unstable; urgency=medium
 
   * d/control: declare compliance to standards version 4.7.0.


=====================================
debian/patches/gcc-14.patch deleted
=====================================
@@ -1,30 +0,0 @@
-Description: fix potential pointer bug flagged by gcc-14.
- Since gcc 14, a whole range of warnings have become errors, notably the
- casting from incompatible pointer types.  In the case of py2bit, this
- seems to flag a real pointer arithmetic bug.  The symptom on build time
- is:
- .
-  py2bit.c:35:24: error: initialization of ‘pyTwoBit_t *’ from incompatible pointer type ‘TwoBit *’ [-Wincompatible-pointer-types]
-     35 |     pyTwoBit_t *pytb = self->tb;
-        |                        ^~~~
- .
- Transmitting the self pointer straight to the pytb pointer newly
- created without referencing to the TwoBit_t pointer, fixes the issue.
-
-Author: Étienne Mollier <emollier at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1075421
-Forwarded: https://github.com/deeptools/py2bit/pull/14
-Last-Update: 2024-07-03
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- python-py2bit.orig/py2bit.c
-+++ python-py2bit/py2bit.c
-@@ -32,7 +32,7 @@
- }
- 
- PyObject *py2bitEnter(pyTwoBit_t *self, PyObject *args) {
--    pyTwoBit_t *pytb = self->tb;
-+    pyTwoBit_t *pytb = self;
- 
-     if(!pytb) {
-         PyErr_SetString(PyExc_RuntimeError, "The 2bit file handle is not open!");


=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
 enable-tests.patch
-gcc-14.patch


=====================================
lib2bit/2bit.c
=====================================
@@ -69,7 +69,7 @@ void bytes2bases(char *seq, uint8_t *byte, uint32_t sz, int offset) {
 
     // Deal with the first partial byte
     if(offset != 0) {
-        while(offset < 4) {
+        while(offset < 4 && pos < sz) {
            seq[pos++] = byte2base(foo, offset++);
         }
         if(pos >= sz) return;


=====================================
py2bit.c
=====================================
@@ -32,9 +32,9 @@ error:
 }
 
 PyObject *py2bitEnter(pyTwoBit_t *self, PyObject *args) {
-    pyTwoBit_t *pytb = self->tb;
+    TwoBit *tb = self->tb;
 
-    if(!pytb) {
+    if(!tb) {
         PyErr_SetString(PyExc_RuntimeError, "The 2bit file handle is not open!");
         return NULL;
     }


=====================================
py2bit.h
=====================================
@@ -1,7 +1,7 @@
 #include <Python.h>
 #include "2bit.h"
 
-#define pyTwoBitVersion "0.3.1"
+#define pyTwoBitVersion "0.3.2"
 
 typedef struct {
     PyObject_HEAD


=====================================
py2bitTest/test.py
=====================================
@@ -42,6 +42,8 @@ class Test():
         assert(tb.bases("chr1") == {'A': 0.08, 'C': 0.08, 'T': 0.08666666666666667, 'G': 0.08666666666666667})
         assert(tb.bases("chr1", 24, 74) == {'A': 0.12, 'C': 0.12, 'T': 0.12, 'G': 0.12})
         assert(tb.bases("chr1", 24, 74, False) == {'A': 6, 'C': 6, 'T': 6, 'G': 6})
+        assert(tb.bases("chr2", 10, 20) == {'A': 0.2, 'C': 0.2, 'T': 0.3, 'G': 0.3})
+        assert(tb.bases("chr2", 10, 20, False) == {'A': 2, 'C': 2, 'T': 3, 'G': 3})
         tb.close()
 
     def testHardMaskedBlocks(self):


=====================================
setup.cfg
=====================================
@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.md
+description_file = README.md


=====================================
setup.py
=====================================
@@ -17,7 +17,7 @@ module1 = Extension('py2bit',
                     include_dirs = ['lib2bit', sysconfig.get_config_var("INCLUDEPY")])
 
 setup(name = 'py2bit',
-       version = '0.3.1',
+       version = '0.3.2',
        description = 'A package for accessing 2bit files using lib2bit',
        author = "Devon P. Ryan",
        author_email = "dpryan79 at gmail.com",



View it on GitLab: https://salsa.debian.org/med-team/python-py2bit/-/compare/11aeb5cce0084a067580265ca579799f9e7f91e7...436e1c7acfd27629d81208f57c2a12f045f4546d

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-py2bit/-/compare/11aeb5cce0084a067580265ca579799f9e7f91e7...436e1c7acfd27629d81208f57c2a12f045f4546d
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/20241118/167665bd/attachment-0001.htm>


More information about the debian-med-commit mailing list