Update to version 0.15.0, remove py2

2 files changed, 17 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 246f171529b0..e9ef7c496116 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,15 @@
 # Generated by mksrcinfo v8
-# Wed Mar  6 17:23:37 UTC 2019
+# Wed Apr 10 14:03:24 UTC 2019
 pkgbase = python-scikit-image
 	pkgdesc = Image processing routines for SciPy
-	pkgver = 0.14.2
+	pkgver = 0.15.0
 	pkgrel = 1
 	url = http://scikit-image.org/
 	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = cython2
 	makedepends = cython
-	makedepends = python2-six
 	makedepends = python-six
-	makedepends = python2-scipy
-	makedepends = python-scipy
-	makedepends = python2-matplotlib
-	makedepends = python-matplotlib
-	makedepends = python2-networkx
-	makedepends = python-networkx
-	makedepends = python2-pillow
-	makedepends = python-pillow
-	makedepends = python2-pywavelets
-	makedepends = python-pywavelets
-	options = !emptydirs
-	source = https://files.pythonhosted.org/packages/source/s/scikit-image/scikit-image-0.14.2.tar.gz
-	sha256sums = 1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f
-
-pkgname = python-scikit-image
 	depends = python-scipy
 	depends = python-matplotlib
 	depends = python-networkx
@@ -35,13 +18,9 @@ pkgname = python-scikit-image
 	optdepends = python-pyqt4: for imshow(x, fancy=True) and skivi
 	optdepends = freeimage: for reading various types of image file formats
 	optdepends = python-pyamg: fast cg_mg mode of random walker segmentation
+	options = !emptydirs
+	source = https://files.pythonhosted.org/packages/source/s/scikit-image/scikit-image-0.15.0.tar.gz
+	sha256sums = df111e654b47e5ea456c50553debe4c5ddd97258894c7ad3b7f2f9f10798e053
 
-pkgname = python2-scikit-image
-	depends = python2-scipy
-	depends = python2-matplotlib
-	depends = python2-networkx
-	depends = python2-pillow
-	depends = python2-pywavelets
-	optdepends = python2-pyqt4: for imshow(x, fancy=True) and skivi
-	optdepends = freeimage: for reading various types of image file formats
+pkgname = python-scikit-image
 
diff --git a/PKGBUILD b/PKGBUILD
index 7fb0a4146237..7d9635314a0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,32 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur dot archlinux dot org>
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur dot archlinux dot org>
 # Contributor: Andrzej Giniewicz <gginiu at gmail dot com>
 
 pkgbase=python-scikit-image
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}")
-pkgver=0.14.2
+pkgname=("python-${_pyname}")
+pkgver=0.15.0
 pkgrel=1
 pkgdesc="Image processing routines for SciPy"
 arch=('i686' 'x86_64')
 url="http://scikit-image.org/"
 license=('BSD')
-makedepends=('cython2' 'cython' 'python2-six' 'python-six' 'python2-scipy' 'python-scipy'
-            'python2-matplotlib' 'python-matplotlib' 'python2-networkx' 'python-networkx'
-            'python2-pillow' 'python-pillow' 'python2-pywavelets' 'python-pywavelets')
+makedepends=('cython' 'python-six')
+depends=('python-scipy' 'python-matplotlib' 'python-networkx' 'python-pillow' 'python-pywavelets')
+optdepends=('python-pyqt4: for imshow(x, fancy=True) and skivi'
+            'freeimage: for reading various types of image file formats'
+            'python-pyamg: fast cg_mg mode of random walker segmentation')
 options=('!emptydirs')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-sha256sums=('1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f')
-
-prepare() {
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-
-    sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-        -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-        -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-        -i $(find . -name '*.py')
-}
+sha256sums=('df111e654b47e5ea456c50553debe4c5ddd97258894c7ad3b7f2f9f10798e053')
 
 build() {
-    msg "Building Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py build
-
-    msg "Building Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
-}
-
-package_python2-scikit-image() {
-    depends=('python2-scipy' 'python2-matplotlib' 'python2-networkx'
-             'python2-pillow' 'python2-pywavelets')
-    optdepends=('python2-pyqt4: for imshow(x, fancy=True) and skivi'
-                'freeimage: for reading various types of image file formats')
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
 
-    install -D -m644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-    mv ${pkgdir}/usr/bin/skivi{,2}
+    python setup.py build
 }
 
-package_python-scikit-image() {
-    depends=('python-scipy' 'python-matplotlib' 'python-networkx'
-             'python-pillow' 'python-pywavelets')
-    optdepends=('python-pyqt4: for imshow(x, fancy=True) and skivi'
-                'freeimage: for reading various types of image file formats'
-                'python-pyamg: fast cg_mg mode of random walker segmentation')
+package() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
     install -D -m644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"