From 42d0bfbd060bc36ad3fbe24c1db2815ce45663e5 Mon Sep 17 00:00:00 2001 From: karlhillx Date: Tue, 2 Jun 2026 01:04:46 -0400 Subject: [PATCH 1/2] Remove scikit-image runtime dependency ccdproc's block_reduce/block_average/block_replicate wrappers delegate to astropy.nddata -- skimage was never called at runtime. The version-skip decorators in the test file used broken string comparison and guarded against an old numpy dev incompatibility that's astropy's problem now. Closes #921. --- CHANGES.rst | 1 + ccdproc/tests/test_ccdproc.py | 9 --------- pyproject.toml | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index cf59393e..3b571709 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,7 @@ Other Changes and Additions ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Remove superfluous license file from the package. [#899] +- scikit-image is no longer a runtime dependency. [#921] 2.5.0 (2025-07-03) ------------------ diff --git a/ccdproc/tests/test_ccdproc.py b/ccdproc/tests/test_ccdproc.py index 2e2cf226..bd24a246 100644 --- a/ccdproc/tests/test_ccdproc.py +++ b/ccdproc/tests/test_ccdproc.py @@ -7,7 +7,6 @@ import astropy import astropy.units as u import pytest -import skimage from astropy.io import fits from astropy.modeling import models from astropy.nddata import ( @@ -801,10 +800,6 @@ def tran(arr): # Test block_reduce and block_replicate wrapper @pytest.mark.skipif(not HAS_BLOCK_X_FUNCS, reason="needs astropy >= 1.1.x") -@pytest.mark.skipif( - (skimage.__version__ < "0.14.2") and ("dev" in xp.__version__), - reason="Incompatibility between scikit-image " "and numpy 1.16", -) def test_block_reduce(): ccd = CCDData( xp.ones((4, 4)), @@ -834,10 +829,6 @@ def test_block_reduce(): @pytest.mark.skipif(not HAS_BLOCK_X_FUNCS, reason="needs astropy >= 1.1.x") -@pytest.mark.skipif( - (skimage.__version__ < "0.14.2") and ("dev" in xp.__version__), - reason="Incompatibility between scikit-image " "and numpy 1.16", -) def test_block_average(): data = xp.asarray( [ diff --git a/pyproject.toml b/pyproject.toml index c3e1ace6..eee6170a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,6 @@ dependencies = [ "astroscrappy>=1.1.0", "numpy>=1.26", "reproject>=0.9.1", - "scikit-image", "scipy", ] From 16dcaa1cf9f4b0af99931d6ffe7f087ebe751553 Mon Sep 17 00:00:00 2001 From: karlhillx Date: Tue, 2 Jun 2026 10:28:58 -0400 Subject: [PATCH 2/2] Add Karl Hill to AUTHORS.rst --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index bc88334e..016ad4a0 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -37,6 +37,7 @@ Alphabetical list of code contributors * Yash Gondhalekar (@Yash-10) * Hans Moritz Günther (@hamogu) * Nathan Heidt (@heidtha) +* Karl Hill (@karlhillx) * Michael Hlabathe (@hlabathems) * Elias Holte (@Sondanaa) * Anthony Horton (@AnthonyHorton)