fix: support both trapz and trapezoid

Author: zonca

src/pysm3/models/catalog.py

@@ -3,6 +3,10 @@
 import h5py
 import healpy as hp
 import numpy as np
+try:
+    from numpy import trapezoid
+else:
+    from numpy import trapz as trapezoid
 from numba import njit
 
 # from astropy import constants as const
@@ -86,7 +90,7 @@ def evaluate_model(freqs, weights, coeff):
         for i_source in range(n_sources):
             for i_freq in range(len(freqs)):
                 flux[i_freq] = evaluate_poly(coeff[i_source, :], logfreqs[i_freq])
-            out[i_source] = np.trapezoid(flux * weights, x=freqs)
+            out[i_source] = trapezoid(flux * weights, x=freqs)
     return out
 
 
@@ -134,7 +138,7 @@ def __init__(
 
     def get_fluxes(self, freqs: u.GHz, coeff="logpolycoefflux", weights=None):
         """Get catalog fluxes in Jy integrated over a bandpass"""
-        weights /= np.trapezoid(weights, x=freqs.to_value(u.GHz))
+        weights /= trapezoid(weights, x=freqs.to_value(u.GHz))
         with h5py.File(self.catalog_filename) as f:
             flux = evaluate_model(freqs.to_value(u.GHz), weights, np.array(f[coeff]))
         return flux * u.Jy

src/pysm3/models/template.py

@@ -14,6 +14,10 @@
 
 import healpy as hp
 import numpy as np
+try:
+    from numpy import trapezoid
+else:
+    from numpy import trapz as trapezoid
 from astropy.io import fits
 
 from .. import mpi, utils
@@ -297,7 +301,7 @@ def apply_normalization(freqs, weights):
         Tuple containing the frequencies and weights. These are numpy arrays
         of equal length.
     """
-    return freqs, weights / np.trapezoid(weights, freqs)
+    return freqs, weights / trapezoid(weights, freqs)
 
 
 def extract_hdu_unit(path, hdu=1, field=0):

tests/test_bandpass_convert_units.py

@@ -3,6 +3,10 @@
 import unittest
 
 import numpy as np
+try:
+    from numpy import trapezoid
+else:
+    from numpy import trapz as trapezoid
 from astropy.io import fits
 from astropy.tests.helper import assert_quantity_allclose
 from scipy import constants
@@ -160,7 +164,7 @@ def setUp(self):
         self.freqs = np.linspace(nu1, nu2, nsamples) * u.GHz
 
         weights = np.ones(len(self.freqs))
-        self.Jysr2CMB = np.trapezoid(weights, x=self.freqs) / np.trapezoid(
+        self.Jysr2CMB = trapezoid(weights, x=self.freqs) / trapezoid(
             (1 * u.K_CMB).to(
                 u.Jy / u.sr, equivalencies=u.cmb_equivalencies(self.freqs)
             ),

tests/test_catalog.py

@@ -7,6 +7,10 @@
 import healpy as hp
 import netCDF4
 import numpy as np
+try:
+    from numpy import trapezoid
+else:
+    from numpy import trapz as trapezoid
 import pytest
 import xarray as xr
 from numpy.testing import assert_allclose

tests/test_utils.py

@@ -3,6 +3,10 @@
 from urllib.error import URLError
 
 import numpy as np
+try:
+    from numpy import trapezoid
+else:
+    from numpy import trapz as trapezoid
 import pixell.enmap
 import pytest
 from astropy.io import fits
@@ -78,7 +82,7 @@ def test_trapz(freq_spacing):
     for i, (_freq, _weight) in enumerate(zip(freqs, weights)):
         utils.trapz_step_inplace(freqs, weights, i, input_maps[i : i + 1], output_map)
 
-    expected = np.trapezoid(weights * input_maps, freqs)
+    expected = trapezoid(weights * input_maps, freqs)
     np.testing.assert_allclose(expected, output_map)