Update testing

Start using automatic requires

python-scikit-image.spec

@@ -1,11 +1,10 @@
-%global srcname scikit-image
+%bcond_with check
 
-# Disable automatic dependency generators until we fixed (optional) deps
-%{?python_disable_dependency_generator}
+%global srcname scikit-image
 
 Name: python-scikit-image
 Version: 0.18.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Image processing in Python
 # The following files are BSD 2 clauses, the rest BSD 3 clauses
 # skimage/graph/_mcp.pyx
@@ -18,33 +17,33 @@ Source0: %{pypi_source}
 BuildRequires: gcc gcc-c++
 BuildRequires: xorg-x11-server-Xvfb
 
-%description
-The scikit-image SciKit (toolkit for SciPy) extends scipy.ndimage to provide a 
-versatile set of image processing routines.
+%global _description %{expand:
+The scikit-image SciKit (toolkit for SciPy) extends scipy.ndimage to provide a
+versatile set of image processing routines.}
 
+%description %_description
 
 %package -n python3-%{srcname}
-Summary: Image processing in Python 3
-BuildRequires: python3-devel python3-setuptools python3-numpy
-BuildRequires: python3-scipy python3-matplotlib python3-pytest
-BuildRequires: python3-six >= 1.3
-BuildRequires: python3-networkx
-BuildRequires: python3-pillow
-BuildRequires: python3-pywt python3-Cython
-BuildRequires: python3-tifffile
-Requires: python3-dask
-Requires: python3-matplotlib-qt5
-Requires: python3-scipy
-Requires: python3-six >= 1.3
-Requires: python3-networkx
-Requires: python3-pillow
-Requires: python3-pywt >= 0.4.0
-Requires: python3-tifffile
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
+Summary: %{summary}
+BuildRequires: python3-devel
+BuildRequires: %{py3_dist setuptools}
+BuildRequires: %{py3_dist Cython}
+BuildRequires: %{py3_dist numpy}
+%if %{with check}
+BuildRequires: %{py3_dist pytest}
+BuildRequires: %{py3_dist scipy}
+BuildRequires: %{py3_dist matplotlib}
+BuildRequires: %{py3_dist networkx}
+BuildRequires: %{py3_dist pillow}
+BuildRequires: %{py3_dist imageio}
+BuildRequires: %{py3_dist tifffile}
+BuildRequires: %{py3_dist PyWavelets}
+# Not in fedora:
+# pytest-localserver
+# Pooch
+%endif
 
-%description -n python3-%{srcname}
-The scikit-image SciKit (toolkit for SciPy) extends scipy.ndimage to provide a 
-versatile set of image processing routines.
+%description -n python3-%{srcname} %_description
 
 %package -n %{srcname}-tools
 Summary: Scikit-image utility tools
@@ -67,25 +66,30 @@ rm $(grep -rl '/\* Generated by Cython')
 %build
 %py3_build
 
-# Requires plot2rst
-#%{__python3} setup.py build_sphinx
-
-
 %install
 %py3_install
 
-# find %{buildroot} -name "*.so" | xargs chmod 755
-
-# Checks are not working at the moment
+%if %{with check}
 %check
 # Fake matplotlibrc
 mkdir -p matplotlib
 touch matplotlib/matplotlibrc
 export XDG_CONFIG_HOME=`pwd`
+export PYTHONDONTWRITEBYTECODE=1
+export PYTEST_ADDOPTS='-p no:cacheprovider'
 pushd %{buildroot}/%{python3_sitearch}
-xvfb-run pytest-%{python3_version} skimage || :
+# We deselect tests that require network
+# or packages not in Fedora
+# require Pooch 
+# require pytest-localserver
+ xvfb-run pytest \
+  --deselect="data/tests/test_data.py::test_skin"  \
+  --deselect "io/tests/test_collection.py::TestImageCollection::test_custom_load_func_w_kwarg" \
+  --deselect "restoration/tests/test_rolling_ball.py::test_ndim" \
+  --deselect="io/tests/test_io.py::test_imread_http_url"  \
+ skimage
 popd
-
+%endif
 
 %files -n python3-%{srcname}
 %doc CONTRIBUTORS.txt RELEASE.txt
@@ -98,6 +102,10 @@ popd
 
 
 %changelog
+* Mon Feb 11 2021 Sergio Pascual <sergiopr@fedoraproject.org> - 0.18.1-3
+- Update testing
+- Start using automatic requires
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild