Skip to content

Remove usage of removed np.int. This was removed in numpy v1.24. #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EricCreusen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove usage of removed np.int. This was removed in numpy v1.24. #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
424465f
Fix usage of removed np.int. This was removed in numpy v1.24.
EricCreusen Jan 23, 2023
5804642
Minor version bump
EricCreusen Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/scaleogram/wfun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def child_wav(wavelet, scale):
if np.max(j) >= np.size(int_psi):
j = np.delete(j, np.where((j >= np.size(int_psi)))[0])

return int_psi[j.astype(np.int)]
return int_psi[j.astype(int)]



Expand Down Expand Up @@ -185,7 +185,7 @@ def fastcwt(data, scales, wavelet, sampling_period=1.0, method='auto'):
# - to be as large as the sum of data length and and maximum wavelet
# support to avoid circular convolution effects
# - additional padding to reach a power of 2 for CPU-optimal FFT
size_pad = lambda s: 2**np.int(np.ceil(np.log2(s[0] + s[1])))
size_pad = lambda s: 2**int(np.ceil(np.log2(s[0] + s[1])))
size_scale0 = size_pad( (len(data),
np.take(scales, 0) * ((x[-1] - x[0]) + 1)) )
fft_data = None
Expand All @@ -198,7 +198,7 @@ def fastcwt(data, scales, wavelet, sampling_period=1.0, method='auto'):
np.arange(scales[i] * (x[-1] - x[0]) + 1) / (scales[i] * step))
if np.max(j) >= np.size(int_psi):
j = np.delete(j, np.where((j >= np.size(int_psi)))[0])
int_psi_scale = int_psi[j.astype(np.int)][::-1]
int_psi_scale = int_psi[j.astype(int)][::-1]

if method == 'conv':
conv = np.convolve(data, int_psi_scale)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setuptools.setup(
name='scaleogram',
version='0.9.5',
version='0.9.6',
author="Alexandre Sauve",
author_email="asauve@gmail.com",
description="User friendly scaleogram plot for Continuous Wavelet Transform",
Expand Down