Update to version 0.7

2 files changed, 29 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26429ca5df87..e2a9fd0f2492 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,26 @@
 pkgbase = python-regions
 	pkgdesc = Astropy affilated package for region handling
-	pkgver = 0.6
+	pkgver = 0.7
 	pkgrel = 1
 	url = http://astropy-regions.readthedocs.io
 	arch = i686
 	arch = x86_64
 	license = BSD
-	checkdepends = python-pytest-astropy
+	checkdepends = python-pytest-astropy-header
+	checkdepends = python-pytest-doctestplus
 	checkdepends = python-matplotlib
-	makedepends = cython
 	makedepends = python-setuptools-scm
+	makedepends = cython
 	makedepends = python-wheel
 	makedepends = python-build
 	makedepends = python-installer
 	makedepends = python-numpy
 	makedepends = python-extension-helpers
-	makedepends = python-astropy
 	makedepends = python-sphinx-astropy
+	makedepends = python-astropy
 	makedepends = python-shapely
-	source = https://files.pythonhosted.org/packages/source/r/regions/regions-0.6.tar.gz
-	md5sums = dad3ff173994b5991b56de31d9c712f6
+	source = https://files.pythonhosted.org/packages/source/r/regions/regions-0.7.tar.gz
+	md5sums = 889f4492283b85374cf219222f0afb8a
 
 pkgname = python-regions
 	depends = python>=3.8
diff --git a/PKGBUILD b/PKGBUILD
index df7c28a9f157..5365972c9eb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,36 @@
 pkgbase=python-regions
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.6
+pkgver=0.7
 pkgrel=1
 pkgdesc="Astropy affilated package for region handling"
 arch=('i686' 'x86_64')
 url="http://astropy-regions.readthedocs.io"
 license=('BSD')
-makedepends=('cython' 'python-setuptools-scm' 'python-wheel' 'python-build' 'python-installer' 'python-numpy' 'python-extension-helpers' 'python-astropy' 'python-sphinx-astropy' 'python-shapely')
-checkdepends=('python-pytest-astropy' 'python-matplotlib')
+makedepends=('python-setuptools-scm'
+             'cython'
+             'python-wheel'
+             'python-build'
+             'python-installer'
+             'python-numpy'
+             'python-extension-helpers'
+             'python-sphinx-astropy'
+             'python-astropy'
+             'python-shapely')
+checkdepends=('python-pytest-astropy-header'
+              'python-pytest-doctestplus'
+              'python-matplotlib') # astropy already in makedepends
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('dad3ff173994b5991b56de31d9c712f6')
+md5sums=('889f4492283b85374cf219222f0afb8a')
+
+get_pyver() {
+    python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
+}
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    sed -i -e "/cython/s/==/>=/" -e "/oldest-supported-numpy/d" pyproject.toml
-    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+    sed -i "/oldest-supported-numpy/d" pyproject.toml
 }
 
 build() {
@@ -27,13 +41,13 @@ build() {
 
     msg "Building Docs"
     cd ${srcdir}/${_pyname}-${pkgver}/docs
-    PYTHONPATH="../build/lib.linux-${CARCH}-${_pyver}" make html
+    PYTHONPATH="../build/lib.linux-${CARCH}-cpython-$(get_pyver)" make html
 }
 
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    pytest "build/lib.linux-${CARCH}-${_pyver}" || warning "Tests failed"
+    pytest "build/lib.linux-${CARCH}-cpython-$(get_pyver)" || warning "Tests failed" # -vv --color=yes
 }
 
 package_python-regions() {