Skip to content

Commit

Permalink
MAINT: bump scikit-image and scipy version.
Browse files Browse the repository at this point in the history
Fix deprecation warnings on scipy access patterns.
  • Loading branch information
rossbar committed Jul 22, 2023
1 parent 5b1a799 commit f3782d4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions deepcell_toolbox/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

import numpy as np
import cv2
import scipy.signal
import scipy as sp

from skimage import transform
from skimage.measure import regionprops
Expand Down Expand Up @@ -281,10 +281,10 @@ def spline_window(window_size, overlap_left, overlap_right, power=2):

def _spline_window(w_size):
intersection = int(w_size / 4)
wind_outer = (abs(2 * (scipy.signal.triang(w_size))) ** power) / 2
wind_outer = (abs(2 * (sp.signal.windows.triang(w_size))) ** power) / 2
wind_outer[intersection:-intersection] = 0

wind_inner = 1 - (abs(2 * (scipy.signal.triang(w_size) - 1)) ** power) / 2
wind_inner = 1 - (abs(2 * (sp.signal.windows.triang(w_size) - 1)) ** power) / 2
wind_inner[:intersection] = 0
wind_inner[-intersection:] = 0

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def run(self, *args, **kwargs):
'pandas',
'networkx>=2.1',
'numpy>=1.16.6',
'scipy>=1.3.0',
'scikit-image>=0.15.0',
'scipy>=1.9.0',
'scikit-image>=0.19',
'scikit-learn',
'tqdm'],
extras_require={
Expand Down

0 comments on commit f3782d4

Please sign in to comment.