From fe7be3beba0e2b4b5fc07b47f6f21630d3f0d1fa Mon Sep 17 00:00:00 2001 From: Jayden Personnat <89941534+jaydenpersonnat@users.noreply.github.com> Date: Thu, 30 May 2024 09:53:27 -0400 Subject: [PATCH] update sphinx in docs + refactor endaq.calc.integrate to use culmulative_trapezoid --- docs/requirements.txt | 2 +- endaq/calc/integrate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index f6e4e536..baa9f312 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==4.2.0 +Sphinx>=5.0.2 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==2.0.0 diff --git a/endaq/calc/integrate.py b/endaq/calc/integrate.py index c2fcd36e..30daf397 100644 --- a/endaq/calc/integrate.py +++ b/endaq/calc/integrate.py @@ -19,7 +19,7 @@ def _integrate( dt = utils.sample_spacing(df) result = df.apply( - functools.partial(scipy.integrate.cumtrapz, dx=dt, initial=0), + functools.partial(scipy.integrate.cumulative_trapezoid, dx=dt, initial=0), axis=0, raw=True, )