diff -Nru skimage-0.14.0/debian/changelog skimage-0.14.0/debian/changelog --- skimage-0.14.0/debian/changelog 2018-06-26 08:06:56.000000000 +0000 +++ skimage-0.14.0/debian/changelog 2018-06-27 07:36:55.000000000 +0000 @@ -1,3 +1,12 @@ +skimage (0.14.0-0ubuntu2) cosmic; urgency=medium + + * Patch upstream requirements so that dask won't become a Depends. + (because python-dask is not available) + * Add pytest to autopkgtest dependencies. + * Allow outputs to stderr during autopkgtest. + + -- Mo Zhou Wed, 27 Jun 2018 07:36:55 +0000 + skimage (0.14.0-0ubuntu1) cosmic; urgency=medium * No-change backport to cosmic diff -Nru skimage-0.14.0/debian/patches/deb_no_dask_in_setup skimage-0.14.0/debian/patches/deb_no_dask_in_setup --- skimage-0.14.0/debian/patches/deb_no_dask_in_setup 1970-01-01 00:00:00.000000000 +0000 +++ skimage-0.14.0/debian/patches/deb_no_dask_in_setup 2018-06-27 07:36:55.000000000 +0000 @@ -0,0 +1,10 @@ +diff --git a/requirements/default.txt b/requirements/default.txt +index 2e080079..21c23c2b 100644 +--- a/requirements/default.txt ++++ b/requirements/default.txt +@@ -5,5 +5,4 @@ networkx>=1.8 + six>=1.10.0 + pillow>=4.3.0 + PyWavelets>=0.4.0 +-dask[array]>=0.9.0 + cloudpickle>=0.2.1 diff -Nru skimage-0.14.0/debian/patches/series skimage-0.14.0/debian/patches/series --- skimage-0.14.0/debian/patches/series 2018-06-26 08:05:47.000000000 +0000 +++ skimage-0.14.0/debian/patches/series 2018-06-27 07:36:55.000000000 +0000 @@ -1,3 +1,4 @@ +deb_no_dask_in_setup deb_no_sphinx_galery fix-doc-links.patch doc-privacy.patch diff -Nru skimage-0.14.0/debian/tests/control skimage-0.14.0/debian/tests/control --- skimage-0.14.0/debian/tests/control 2018-06-26 08:05:47.000000000 +0000 +++ skimage-0.14.0/debian/tests/control 2018-06-27 07:36:55.000000000 +0000 @@ -1,5 +1,7 @@ Tests: python2 -Depends: python-all, python-nose, python-skimage, python-pil | python-imaging, python-matplotlib, python-tk, python-networkx, xauth, xvfb +Depends: python-all, python-nose, python-skimage, python-pil | python-imaging, python-matplotlib, python-tk, python-networkx, xauth, xvfb, python-pytest +Restrictions: allow-stderr Tests: python3 -Depends: python3-all, python3-nose, python3-skimage, python3-pil | python3-imaging, python3-matplotlib, python3-tk, python3-networkx, xauth, xvfb +Depends: python3-all, python3-nose, python3-skimage, python3-pil | python3-imaging, python3-matplotlib, python3-tk, python3-networkx, xauth, xvfb, python3-pytest, python3-dask +Restrictions: allow-stderr