Skip to content

Commit 13b4349

Browse files
committed
Remove conftest.py
1 parent e5f7f01 commit 13b4349

File tree

4 files changed

+1
-19
lines changed

4 files changed

+1
-19
lines changed

TODO.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ Post numpy 2
4343
`# TODO: when minimum numpy`
4444
in `skimage/color/colorconv.py`, `skimage/color/tests/test_colorconv.py`,
4545
`skimage/measure/_blur_effect.py`, and `skimage/util/tests/test_montage.py`
46-
- Remove `handle_np2` from `skimage/conftest.py`
4746
- Once matplotlib doesn't constrain to numpy<2.0 via contourpy (or 2.0 is
4847
minimal required version): consider re-adding matplotlib to the test
4948
dependencies. Also remove temporary assert for NumPy 2.0 in

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ filterwarnings = [
194194
"ignore:.*use `imageio` or other I/O packages directly.*:FutureWarning:skimage",
195195
"ignore:Implicit conversion of A to CSR:scipy.sparse.SparseEfficiencyWarning" # warn by pyamg in ruge_stuben_solver
196196
]
197+
doctest_norecursedirs = ['io/_plugins']
197198

198199

199200
[tool.changelist]

src/skimage/conftest.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/skimage/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ endif
115115
python_sources = [
116116
'__init__.py',
117117
'__init__.pyi',
118-
'conftest.py',
119118
'py.typed'
120119
]
121120

0 commit comments

Comments
 (0)