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

Remove old scipy cruft #6681

Merged
merged 2 commits into from Jan 19, 2023
Merged

Conversation

jarrodmillman
Copy link
Contributor

@jarrodmillman jarrodmillman commented Jan 18, 2023

@stefanv This needs more work. In skimage/segmentation/tests/test_random_walker.py, we have

# older versions of scipy raise a warning with new NumPy because they use
# numpy.rank() instead of arr.ndim or numpy.linalg.matrix_rank.
SCIPY_RANK_WARNING = r'numpy.linalg.matrix_rank|\A\Z'
PYAMG_MISSING_WARNING = r'pyamg|\A\Z'
PYAMG_OR_SCIPY_WARNING = SCIPY_RANK_WARNING + '|' + PYAMG_MISSING_WARNING
NUMPY_MATRIX_WARNING = None

I don't think we need SCIPY_RANK_WARNING, PYAMG_OR_SCIPY_WARNING, or NUMPY_MATRIX_WARNING now. Thoughts?

@jarrodmillman jarrodmillman added this to the 0.20 milestone Jan 18, 2023
@jarrodmillman jarrodmillman marked this pull request as draft January 18, 2023 16:54
@stefanv
Copy link
Member

stefanv commented Jan 19, 2023

Yes, looks like we can only use PYAMG_MISSING_WARNING.

@jarrodmillman jarrodmillman marked this pull request as ready for review January 19, 2023 05:03
Copy link
Member

@lagru lagru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thanks Jarrod.

@stefanv stefanv merged commit da4119e into scikit-image:main Jan 19, 2023
@jarrodmillman jarrodmillman deleted the scipy-1.3-and-1.4 branch February 17, 2023 19:06
@lagru lagru added the 🔧 type: Maintenance Refactoring and maintenance of internals label Feb 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔧 type: Maintenance Refactoring and maintenance of internals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants