Skip to content
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.

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

Get rid of distutils dependency -- Depend on newer scipy #346

Merged
merged 3 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def run_tests(self):
"dask[array] >=2023.2.0",
"dask[dataframe] >=2023.2.0",
"numpy >=1.18",
"scipy >=0.19.1",
"scipy >=1.7.0",
"pims >=0.4.1",
"tifffile >=2018.10.18",
"pandas >=2.0.0",
Expand Down
2 changes: 0 additions & 2 deletions tests/test_dask_image/test_ndfourier/test_core.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import numbers
from distutils.version import LooseVersion

import pytest
import numpy as np
Expand Down Expand Up @@ -92,7 +91,6 @@ def test_fourier_filter_identity(funcname, s):
)
def test_fourier_filter_type(funcname, upcast_type, dtype):
if (
LooseVersion(sp.__version__) >= "1.0.0" and
dtype in [np.int64, np.float64] and
funcname in ["fourier_gaussian", "fourier_uniform"]
):
Expand Down
9 changes: 1 addition & 8 deletions tests/test_dask_image/test_ndmeasure/test_core.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from distutils.version import LooseVersion
import itertools as it
import warnings as wrn

Expand Down Expand Up @@ -107,13 +106,7 @@ def test_center_of_mass(datatype):
]
)
def test_measure_props(funcname, shape, chunks, has_lbls, ind):
# early scipy version uses a different name sum insted of sum_labels.
if funcname == 'sum_labels' and scipy.__version__ < LooseVersion('1.6.0'):
scipy_funcname = 'sum'
else:
scipy_funcname = funcname

sp_func = getattr(scipy.ndimage, scipy_funcname)
sp_func = getattr(scipy.ndimage, funcname)
da_func = getattr(dask_image.ndmeasure, funcname)

a = np.random.random(shape)
Expand Down
Loading