[med-svn] [Git][med-team/python-dicompylercore][master] 4 commits: Adapt to numpy 1.24

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / python-dicompylercore


Commits:
76956e96 by Andreas Tille at 2023-01-14T16:14:05+01:00
Adapt to numpy 1.24

- - - - -
40969e90 by Andreas Tille at 2023-01-14T16:14:31+01:00
routine-update: Standards-Version: 4.6.2

- - - - -
9d9eb409 by Andreas Tille at 2023-01-14T16:22:27+01:00
Also replace np.float

- - - - -
9c964dd9 by Andreas Tille at 2023-01-14T16:23:48+01:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/numpy_1.24.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+python-dicompylercore (0.5.5-5) unstable; urgency=medium
+
+  * Adapt to numpy 1.24
+    Closes: #1028823
+  * Standards-Version: 4.6.2 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Sat, 14 Jan 2023 16:22:44 +0100
+
 python-dicompylercore (0.5.5-4) unstable; urgency=medium
 
   * Fix watch file


=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-pydicom <!nocheck>,
                python3-shapely <!nocheck>,
                python3-skimage <!nocheck>
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/python-dicompylercore
 Vcs-Git: https://salsa.debian.org/med-team/python-dicompylercore.git
 Homepage: https://github.com/dicompyler/dicompyler-core


=====================================
debian/patches/numpy_1.24.patch
=====================================
@@ -0,0 +1,36 @@
+Description: Adapt to numpy 1.24
+Bug-Debian: https://bugs.debian.org/1028823
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 14 Jan 2023 16:12:32 +0100
+
+--- a/dicompylercore/dvhcalc.py
++++ b/dicompylercore/dvhcalc.py
+@@ -237,7 +237,7 @@ def calculate_plane_histogram(plane, dos
+     # and boolean xor to remove holes
+     for i, contour in enumerate(contours):
+         m = get_contour_mask(dd, id, dosegridpoints, contour)
+-        grid = np.logical_xor(m.astype(np.uint8), grid).astype(np.bool)
++        grid = np.logical_xor(m.astype(np.uint8), grid).astype(bool)
+ 
+     hist, vol = calculate_contour_dvh(grid, doseplane, maxdose, dd, id,
+                                       structure)
+@@ -253,7 +253,7 @@ def get_contour_mask(dd, id, dosegridpoi
+     # def inpolygon(polygon, xp, yp):
+     #     return np.array(
+     #         [Point(x, y).intersects(polygon) for x, y in zip(xp, yp)],
+-    #         dtype=np.bool)
++    #         dtype=bool)
+ 
+     # p = Polygon(contour)
+     # x, y = np.meshgrid(np.array(dd['lut'][0]), np.array(dd['lut'][1]))
+@@ -416,8 +416,8 @@ def get_resampled_lut(index_extents,
+         abs(index_extents[1] - index_extents[3])
+     ])
+     xsamples, ysamples = sampling_rate * min_pixel_spacing / new_pixel_spacing
+-    x = np.linspace(extents[0], extents[2], int(xsamples), dtype=np.float)
+-    y = np.linspace(extents[1], extents[3], int(ysamples), dtype=np.float)
++    x = np.linspace(extents[0], extents[2], int(xsamples), dtype=float)
++    y = np.linspace(extents[1], extents[3], int(ysamples), dtype=float)
+     return x, y
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+numpy_1.24.patch



View it on GitLab: https://salsa.debian.org/med-team/python-dicompylercore/-/compare/3abce600132742f1cb9a94c0b7d7c7398f4ef63d...9c964dd95baeec60e7bcb3290f18b253a36237fd

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-dicompylercore/-/compare/3abce600132742f1cb9a94c0b7d7c7398f4ef63d...9c964dd95baeec60e7bcb3290f18b253a36237fd
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/20230114/d7edbf5e/attachment-0001.htm>