From 005d57e2ee08bef6e522aacb2b6f1a4945eddaaf Mon Sep 17 00:00:00 2001
From: Sarah Ottinger <schalaalexiazeal@gmail.com>
Date: Wed, 16 Dec 2020 14:18:31 -0800
Subject: [PATCH] scikit-image 0.18

---
 mingw-w64-python-scikit-image/PKGBUILD | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/mingw-w64-python-scikit-image/PKGBUILD b/mingw-w64-python-scikit-image/PKGBUILD
index 65849132d3..6e2448e997 100644
--- a/mingw-w64-python-scikit-image/PKGBUILD
+++ b/mingw-w64-python-scikit-image/PKGBUILD
@@ -3,20 +3,32 @@
 _realname=scikit-image
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=0.17.2
+pkgver=0.18.0
 pkgrel=1
 pkgdesc='Image processing routines for SciPy (mingw-w64)'
 arch=('any')
 url="http://scikit-image.org/"
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python-matplotlib" "${MINGW_PACKAGE_PREFIX}-python-scipy" "${MINGW_PACKAGE_PREFIX}-python-pywavelets" "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-networkx" "${MINGW_PACKAGE_PREFIX}-python-imageio" "${MINGW_PACKAGE_PREFIX}-python-tifffile" "${MINGW_PACKAGE_PREFIX}-python-pillow")
+depends=("${MINGW_PACKAGE_PREFIX}-python-matplotlib>3.0.0"
+"${MINGW_PACKAGE_PREFIX}-python-scipy>=1.0.1"
+"${MINGW_PACKAGE_PREFIX}-python-pywavelets>=1.1.1"
+"${MINGW_PACKAGE_PREFIX}-python-numpy>1.18.0"
+"${MINGW_PACKAGE_PREFIX}-python-networkx>=2.0"
+"${MINGW_PACKAGE_PREFIX}-python-imageio>=2.3.0"
+"${MINGW_PACKAGE_PREFIX}-python-tifffile>=2019.7.26"
+"${MINGW_PACKAGE_PREFIX}-python-pillow>7.1.1")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-cython")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest>=5.2.0"
+"${MINGW_PACKAGE_PREFIX}-python-pytest-cov>=2.7.0"
+"${MINGW_PACKAGE_PREFIX}-python-pytest-flake8"
+"${MINGW_PACKAGE_PREFIX}-python-pytest-localserver"
+"${MINGW_PACKAGE_PREFIX}-python-pooch")
 optdepends=("${MINGW_PACKAGE_PREFIX}-python-pyqt5: for imshow(x, fancy=True) and skivi"
-"${MINGW_PACKAGE_PREFIX}-freeimage:  for reading various types of image file formats"
+"${MINGW_PACKAGE_PREFIX}-freeimage: for reading various types of image file formats"
 "${MINGW_PACKAGE_PREFIX}-python-pyamg: fast cg_mg mode of random walker segmentation")
 options=('!emptydirs')
 source=("https://files.pythonhosted.org/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('bd954c0588f0f7e81d9763dc95e06950e68247d540476e06cb77bcbcd8c2d8b3')
+sha256sums=('a0c78a117080101dbeeaa430804fe9512575cf2696ddbf822a7ee30d0776f5da')
 
 prepare() {  
   cd "$srcdir"
@@ -31,6 +43,11 @@ build() {
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
+check() {
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/pytest || warning "Tests failed"
+}
+
 package() {
   cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \