Update to version 0.6

2 files changed, 21 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c50dff6abfc..6d278540981c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,33 @@
 pkgbase = python-reproject
 	pkgdesc = Python-based Astronomical image reprojection
-	pkgver = 0.5.1
+	pkgver = 0.6
 	pkgrel = 1
 	url = http://reproject.readthedocs.io/en/stable/
 	arch = i686
 	arch = x86_64
 	license = BSD
+	checkdepends = python-shapely
+	checkdepends = python-pytest-astropy
 	makedepends = cython
-	makedepends = cython2
-	makedepends = python-astropy>=2.0
-	makedepends = python2-astropy>=2.0
+	makedepends = python-astropy>=3.2
 	makedepends = python-astropy-helpers
-	makedepends = python2-astropy-helpers
 	makedepends = python-astropy-healpix>=0.2
-	makedepends = python2-astropy-healpix>=0.2
 	makedepends = python-sphinx-astropy
-	source = https://files.pythonhosted.org/packages/source/r/reproject/reproject-0.5.1.tar.gz
-	md5sums = 3de3fddddea39425e175d78fc62039a2
+	makedepends = python-pyvo
+	makedepends = python-mimeparse
+	source = https://files.pythonhosted.org/packages/source/r/reproject/reproject-0.6.tar.gz
+	md5sums = e0280e7627eb26dc0dcd62c145a15f18
 
 pkgname = python-reproject
 	depends = python>=3.5
-	depends = python-numpy>=1.10
+	depends = python-numpy>=1.13
 	depends = python-scipy>=0.9
-	depends = python-astropy>=2.0
+	depends = python-astropy>=3.2
 	depends = python-astropy-healpix>=0.2
 	optdepends = python-shapely>=1.6: For some of the mosaicking functionality
 	optdepends = python-reproject-doc: Documentation for Reproject
 	optdepends = python-pytest-astropy: For testing
 
-pkgname = python2-reproject
-	depends = python2>=2.7
-	depends = python2-numpy>=1.10
-	depends = python2-scipy>=0.9
-	depends = python2-astropy>=2.0
-	depends = python2-astropy-healpix>=0.2
-	optdepends = python2-shapely: For some of the mosaicking functionality
-	optdepends = python-reproject-doc: Documentation for Reproject
-	optdepends = python2-pytest<3.7: For testing
-
 pkgname = python-reproject-doc
 	pkgdesc = Documentation for Python Reproject module
 
diff --git a/PKGBUILD b/PKGBUILD
index 2230564f481f..d9da1d2ef9a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,25 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-reproject
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.5.1
+pkgname=("python-${_pyname}" "python-${_pyname}-doc")
+pkgver=0.6
 pkgrel=1
 pkgdesc="Python-based Astronomical image reprojection"
 arch=('i686' 'x86_64')
 url="http://reproject.readthedocs.io/en/stable/"
 license=('BSD')
-makedepends=('cython' 'cython2' 'python-astropy>=2.0' 'python2-astropy>=2.0' 'python-astropy-helpers' 'python2-astropy-helpers' 'python-astropy-healpix>=0.2' 'python2-astropy-healpix>=0.2' 'python-sphinx-astropy')
-#checkdepends=('python-shapely' 'python-pytest-astropy')
+makedepends=('cython' 'python-astropy>=3.2' 'python-astropy-helpers' 'python-astropy-healpix>=0.2' 'python-sphinx-astropy' 'python-pyvo' 'python-mimeparse')
+checkdepends=('python-shapely' 'python-pytest-astropy')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('3de3fddddea39425e175d78fc62039a2')
+md5sums=('e0280e7627eb26dc0dcd62c145a15f18')
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    sed -i -e '/auto_use/s/True/False/' setup.cfg
 
-    cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+    sed -i -e '/auto_use/s/True/False/' setup.cfg
 }
 
 build() {
-    msg "Building Python2"
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
-    python2 setup.py build --use-system-libraries --offline
-
-    msg "Building Python3"
     cd ${srcdir}/${_pyname}-${pkgver}
     python setup.py build --use-system-libraries --offline
 
@@ -33,30 +27,14 @@ build() {
     python setup.py build_docs
 }
 
-#check() {
-#   msg "Checking Python3"
-#   cd ${srcdir}/${_pyname}-${pkgver}
-#   python setup.py test
-
-#   msg "Checking Python2"
-#   cd ${srcdir}/${_pyname}-${pkgver}-py2
-#   python2 setup.py test
-#}
-
-package_python2-reproject() {
-    depends=('python2>=2.7' 'python2-numpy>=1.10' 'python2-scipy>=0.9' 'python2-astropy>=2.0' 'python2-astropy-healpix>=0.2')
-    optdepends=('python2-shapely: For some of the mosaicking functionality'
-                'python-reproject-doc: Documentation for Reproject'
-                'python2-pytest<3.7: For testing')
-    cd ${srcdir}/${_pyname}-${pkgver}-py2
+check() {
+    cd ${srcdir}/${_pyname}-${pkgver}
 
-    install -D -m644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
+    python setup.py test
 }
 
 package_python-reproject() {
-    depends=('python>=3.5' 'python-numpy>=1.10' 'python-scipy>=0.9' 'python-astropy>=2.0' 'python-astropy-healpix>=0.2')
+    depends=('python>=3.5' 'python-numpy>=1.13' 'python-scipy>=0.9' 'python-astropy>=3.2' 'python-astropy-healpix>=0.2')
     optdepends=('python-shapely>=1.6: For some of the mosaicking functionality'
                 'python-reproject-doc: Documentation for Reproject'
                 'python-pytest-astropy: For testing')
@@ -71,6 +49,7 @@ package_python-reproject-doc() {
     pkgdesc="Documentation for Python Reproject module"
     cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
 
+    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../LICENSE.md
     install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
     cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
 }