summaryrefslogtreecommitdiff
diff options
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/scipy_1.14_69f034b.patch63
-rw-r--r--debian/patches/series1
3 files changed, 72 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 08643aa..f261524 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-peakutils (1.3.4+ds-3) unstable; urgency=medium
+
+ * Team upload.
+ * debian patch scipy_1.14_69f034b.patch applies upstream commit
+ 69f034b to fix build with scipy 1.14. Closes: #1079682.
+
+ -- Drew Parsons <dparsons@debian.org> Fri, 01 Nov 2024 20:19:48 +0100
+
python-peakutils (1.3.4+ds-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/scipy_1.14_69f034b.patch b/debian/patches/scipy_1.14_69f034b.patch
new file mode 100644
index 0000000..66c5f06
--- /dev/null
+++ b/debian/patches/scipy_1.14_69f034b.patch
@@ -0,0 +1,63 @@
+From 69f034b6bfbc17db9f559529309077016239bd56 Mon Sep 17 00:00:00 2001
+From: Lucas Hermann Negri <lucashnegri@gmail.com>
+Date: Wed, 26 Jun 2024 21:20:12 -0400
+Subject: [PATCH] Fixes issue #117
+
+---
+ peakutils/__init__.py | 2 +-
+ peakutils/peak.py | 8 ++++----
+ setup.py | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/peakutils/__init__.py b/peakutils/__init__.py
+index 85d366e..5a9c1c6 100644
+--- a/peakutils/__init__.py
++++ b/peakutils/__init__.py
+@@ -2,4 +2,4 @@ from .baseline import *
+ from .peak import *
+ from .prepare import *
+
+-__version__ = '1.3.4'
++__version__ = '1.3.5'
+diff --git a/peakutils/peak.py b/peakutils/peak.py
+index 855d9a4..d75ef69 100644
+--- a/peakutils/peak.py
++++ b/peakutils/peak.py
+@@ -4,7 +4,7 @@ import warnings
+
+ import numpy as np
+ from scipy import optimize
+-from scipy.integrate import simps
++from scipy.integrate import simpson
+
+ eps = np.finfo(float).eps
+
+@@ -143,9 +143,9 @@ def centroid2(y, x=None, dx=1.0):
+ if x is None:
+ x = np.arange(yt.size, dtype="float") * dx
+
+- normaliser = simps(yt, x)
+- centroid = simps(x * yt, x) / normaliser
+- var = simps((x - centroid) ** 2 * yt, x) / normaliser
++ normaliser = simpson(y=yt, x=x)
++ centroid = simpson(y=x * yt, x=x) / normaliser
++ var = simpson(y=(x - centroid) ** 2 * yt, x=x) / normaliser
+ return centroid, np.sqrt(var)
+
+
+diff --git a/setup.py b/setup.py
+index 07d8584..cf54999 100644
+--- a/setup.py
++++ b/setup.py
+@@ -5,7 +5,7 @@ with open('README.rst') as readme:
+
+ setup(
+ name='PeakUtils',
+- version='1.3.4',
++ version='1.3.5',
+ description='Peak detection utilities for 1D data',
+ long_description=long_description,
+ long_description_content_type="text/x-rst",
+--
+2.46.2
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bacf688
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+scipy_1.14_69f034b.patch