Update to version 0.7

3 files changed, 48 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e37122fe0d7b..43a3c4369a05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,38 @@
 pkgbase = python-astropy-healpix
 	pkgdesc = BSD-licensed HEALPix for Astropy
-	pkgver = 0.6
+	pkgver = 0.7
 	pkgrel = 1
-	url = http://astropy-healpix.readthedocs.io/
+	url = http://astropy-healpix.readthedocs.io
 	arch = i686
 	arch = x86_64
 	license = BSD
 	checkdepends = python-pytest-doctestplus
+	checkdepends = python-pytest-astropy-header
 	checkdepends = python-hypothesis
+	checkdepends = python-healpy
 	makedepends = python-setuptools-scm
 	makedepends = python-extension-helpers
+	makedepends = python-wheel
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-numpy
 	makedepends = python-sphinx-astropy
 	makedepends = python-astropy
-	source = https://files.pythonhosted.org/packages/source/a/astropy_healpix/astropy_healpix-0.6.tar.gz
+	source = https://files.pythonhosted.org/packages/source/a/astropy_healpix/astropy_healpix-0.7.tar.gz
 	source = https://lambda.gsfc.nasa.gov/data/map/dr3/skymaps/5yr//wmap_band_imap_r9_5yr_K_v3.fits
 	source = fix_deprecation_warning.patch
 	source = use_local_doc_fits.patch
-	md5sums = 95e4b5e7d57bd3756d2086516f68e9d5
+	md5sums = a8c88be02ac283b48f8ede47e0861633
 	md5sums = f183da2392e37b9b424e9866d7bca559
 	md5sums = 71e532a1fed7a57d4ccf0d3e41035dd8
-	md5sums = 65c75d9f8ada192e20aabf0064ac32bf
+	md5sums = 6fc85696c0103b265309db0fa3339b33
 
 pkgname = python-astropy-healpix
-	depends = python>=3.6
+	depends = python>=3.7
 	depends = python-numpy>=1.11
-	depends = python-astropy>=2.0
+	depends = python-astropy>=3
 	optdepends = python-astropy-healpix-doc: Documentation for Astropy-HEALPix
 
 pkgname = python-astropy-healpix-doc
 	pkgdesc = Documentation for AstroPy-HEALPix
+	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index b5d094663cba..f5d0491c2397 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,59 +3,73 @@ pkgbase=python-astropy-healpix
 _pyname=astropy_healpix
 _pname=${pkgbase#python-}
 pkgname=("python-${_pname}" "python-${_pname}-doc")
-pkgver=0.6
+pkgver=0.7
 pkgrel=1
 pkgdesc="BSD-licensed HEALPix for Astropy"
 arch=('i686' 'x86_64')
-url="http://astropy-healpix.readthedocs.io/"
+url="http://astropy-healpix.readthedocs.io"
 license=('BSD')
-makedepends=('python-setuptools-scm' 'python-extension-helpers' 'python-numpy' 'python-sphinx-astropy' 'python-astropy')
-checkdepends=('python-pytest-doctestplus' 'python-hypothesis')
+makedepends=('python-setuptools-scm'
+             'python-extension-helpers'
+             'python-wheel'
+             'python-build'
+             'python-installer'
+             'python-numpy'
+             'python-sphinx-astropy'
+             'python-astropy')
+checkdepends=('python-pytest-doctestplus'
+              'python-pytest-astropy-header'
+              'python-hypothesis'
+              'python-healpy')  # astropy already in makedepends
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
         "https://lambda.gsfc.nasa.gov/data/map/dr3/skymaps/5yr//wmap_band_imap_r9_5yr_K_v3.fits"
         'fix_deprecation_warning.patch'
         'use_local_doc_fits.patch')
-md5sums=('95e4b5e7d57bd3756d2086516f68e9d5'
+md5sums=('a8c88be02ac283b48f8ede47e0861633'
          'f183da2392e37b9b424e9866d7bca559'
          '71e532a1fed7a57d4ccf0d3e41035dd8'
-         '65c75d9f8ada192e20aabf0064ac32bf')
+         '6fc85696c0103b265309db0fa3339b33')
+
+get_pyver() {
+    python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
+}
 
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+    sed -i -e "/oldest-supported-numpy/d" -e "/\"extension-helper/s/,/\]/" pyproject.toml
     cp ${srcdir}/wmap_band_imap_r9_5yr_K_v3.fits docs
     patch -Np1 -i "${srcdir}/use_local_doc_fits.patch"
 }
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
+    python -m build --wheel --no-isolation
 
     msg "Building Docs"
     cd ${srcdir}/${_pyname}-${pkgver}/docs
-    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-    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"
 }
 
 package_python-astropy-healpix() {
-    depends=('python>=3.6' 'python-numpy>=1.11' 'python-astropy>=2.0')
+    depends=('python>=3.7' 'python-numpy>=1.11' 'python-astropy>=3')
     optdepends=('python-astropy-healpix-doc: Documentation for Astropy-HEALPix')
     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}"
-    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+    python -m installer --destdir="${pkgdir}" dist/*.whl
 }
 
 package_python-astropy-healpix-doc() {
     pkgdesc="Documentation for AstroPy-HEALPix"
+    arch=('any')
     cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
 
     install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../LICENSE.md
diff --git a/use_local_doc_fits.patch b/use_local_doc_fits.patch
index b1f09f3c19aa..2ef5545ae04e 100644
--- a/use_local_doc_fits.patch
+++ b/use_local_doc_fits.patch
@@ -1,11 +1,15 @@
 --- a/docs/interpolation.rst	2018-07-02 21:32:42.390297000 +0800
-+++ b/docs/interpolation.rst	2021-01-15 12:43:57.605251446 +0800
-@@ -118,7 +118,7 @@
++++ b/docs/interpolation.rst	2021-01-15 14:50:10.578665985 +0800
+@@ -116,9 +118,10 @@
+ .. plot::
+    :include-source:
  
-     # Get the data
+-    # Get the data
++    # Get the data, use local fits if no network
      from astropy.io import fits
 -    hdulist = fits.open('https://lambda.gsfc.nasa.gov/data/map/dr3/skymaps/5yr//wmap_band_imap_r9_5yr_K_v3.fits')
-+    hdulist = fits.open('wmap_band_imap_r9_5yr_K_v3.fits')
++    try: hdulist = fits.open('https://lambda.gsfc.nasa.gov/data/map/dr3/skymaps/5yr//wmap_band_imap_r9_5yr_K_v3.fits')
++    except Exception: hdulist = fits.open('wmap_band_imap_r9_5yr_K_v3.fits')
  
      # Set up the HEALPix projection
      from astropy_healpix import HEALPix