summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO53
-rw-r--r--.gitignore10
-rw-r--r--PKGBUILD96
-rw-r--r--use_local_doc_fits.patch15
4 files changed, 93 insertions, 81 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 80c373549356..4e0c04ec912f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,38 @@
pkgbase = python-astropy-healpix
pkgdesc = BSD-licensed HEALPix for Astropy
- pkgver = 0.4
- pkgrel = 2
- url = http://astropy-healpix.readthedocs.io/
+ pkgver = 1.0.3
+ pkgrel = 1
+ url = http://astropy-healpix.readthedocs.io
arch = i686
arch = x86_64
- license = BSD
- makedepends = python-setuptools
- makedepends = python2-setuptools
- makedepends = python2-numpy
- makedepends = python-astropy
- makedepends = python-astropy-helpers>=3.1
- makedepends = python-astropy-helpers<3.2
- makedepends = python2-astropy-helpers
+ license = BSD-3-Clause
+ checkdepends = python-pytest-astropy-header
+ checkdepends = python-pytest-doctestplus
+ 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
- source = https://files.pythonhosted.org/packages/source/a/astropy-healpix/astropy-healpix-0.4.tar.gz
- source = python2-astropy-healpix.install
+ makedepends = python-astropy
+ source = https://files.pythonhosted.org/packages/source/a/astropy_healpix/astropy_healpix-1.0.3.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
- md5sums = 59174f71ae6ef8b8969b2cfce702231e
- md5sums = 68d099a7f241f405c488da6f09618890
+ source = use_local_doc_fits.patch
+ md5sums = 6e791154dfc2510353cfd3e44e7e783d
+ md5sums = f183da2392e37b9b424e9866d7bca559
md5sums = 71e532a1fed7a57d4ccf0d3e41035dd8
+ md5sums = 6fc85696c0103b265309db0fa3339b33
pkgname = python-astropy-healpix
- depends = python>=3.5
- depends = python-numpy>=1.10
- depends = python-astropy>=1.2
- optdepends = python-astropy-healpix-doc: Documentation for Astropy-HEALPix
- optdepends = python-pytest-astropy: For testing
- optdepends = python-astropy<3.2: For testing
-
-pkgname = python2-astropy-healpix
- install = python2-astropy-healpix.install
- depends = python2>=2.7
- depends = python2-numpy>=1.10
- depends = python2-astropy>=1.2
+ depends = python>=3.9
+ depends = python-numpy>=1.19
+ 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/.gitignore b/.gitignore
new file mode 100644
index 000000000000..fb6da753b176
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+src
+pkg
+*.src.tar.gz
+*.tar.gz
+*.tar.bz2
+*.part
+*.pkg.tar.*
+*.fits
+temp
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index c60601d9a1d5..8520a35151d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,87 +1,77 @@
# Maintainer: Astro Benzene <universebenzene at sina dot com>
pkgbase=python-astropy-healpix
-_pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.4
-pkgrel=2
+_pyname=astropy_healpix
+_pname=${pkgbase#python-}
+pkgname=("python-${_pname}" "python-${_pname}-doc")
+pkgver=1.0.3
+pkgrel=1
pkgdesc="BSD-licensed HEALPix for Astropy"
arch=('i686' 'x86_64')
-url="http://astropy-healpix.readthedocs.io/"
-license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python2-numpy' 'python-astropy' 'python-astropy-helpers>=3.1' 'python-astropy-helpers<3.2' 'python2-astropy-helpers' 'python-sphinx-astropy')
-#checkdepends=('python-pytest-astropy'
-# 'python2-pytest32'
-# 'python2-healpy'
-# 'python-healpy'
-# 'python2-hypothesis'
-# 'python-hypothesis')
+url="http://astropy-healpix.readthedocs.io"
+license=('BSD-3-Clause')
+makedepends=('python-setuptools-scm'
+ 'python-extension-helpers'
+ 'python-wheel'
+ 'python-build'
+ 'python-installer'
+ 'python-numpy'
+ 'python-sphinx-astropy'
+ 'python-astropy')
+checkdepends=('python-pytest-astropy-header'
+ 'python-pytest-doctestplus'
+ 'python-hypothesis'
+ 'python-healpy') # astropy already in makedepends
source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
- "python2-${_pyname}.install"
- 'fix_deprecation_warning.patch')
-md5sums=('59174f71ae6ef8b8969b2cfce702231e'
- '68d099a7f241f405c488da6f09618890'
- '71e532a1fed7a57d4ccf0d3e41035dd8')
+ "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=('6e791154dfc2510353cfd3e44e7e783d'
+ 'f183da2392e37b9b424e9866d7bca559'
+ '71e532a1fed7a57d4ccf0d3e41035dd8'
+ '6fc85696c0103b265309db0fa3339b33')
+
+get_pyver() {
+ python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
+}
prepare() {
cd ${srcdir}/${_pyname}-${pkgver}
- sed -i -e '/auto_use/s/True/False/' setup.cfg
- patch -Np1 -i "${srcdir}/fix_deprecation_warning.patch"
- cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+# 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() {
- 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
+ python -m build --wheel --no-isolation --skip-dependency-check
msg "Building Docs"
- python setup.py build_docs
+ PYTHONPATH="../build/lib.linux-${CARCH}-cpython-$(get_pyver)" make -C docs html
}
-#check() {
-# msg "Checking Python3"
-# cd ${srcdir}/${_pyname}-${pkgver}
-# python setup.py test
-#
-# if [ -z $(pacman -Qsq python2-pytest-cov) ]; then
-# msg "Checking Python2"
-# cd ${srcdir}/${_pyname}-${pkgver}-py2
-# python2 setup.py test
-# fi
-#}
-
-package_python2-astropy-healpix() {
- depends=('python2>=2.7' 'python2-numpy>=1.10' 'python2-astropy>=1.2')
- optdepends=('python-astropy-healpix-doc: Documentation for Astropy-HEALPix')
- install=python2-${_pyname}.install
- 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
+ pytest "build/lib.linux-${CARCH}-cpython-$(get_pyver)" || warning "Tests failed" # -vv -l -ra --color=yes -o console_output_style=count
}
package_python-astropy-healpix() {
- depends=('python>=3.5' 'python-numpy>=1.10' 'python-astropy>=1.2')
- optdepends=('python-astropy-healpix-doc: Documentation for Astropy-HEALPix'
- 'python-pytest-astropy: For testing'
- 'python-astropy<3.2: For testing')
+ depends=('python>=3.9' 'python-numpy>=1.19' '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 --use-system-libraries --offline
+ 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
install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
}
diff --git a/use_local_doc_fits.patch b/use_local_doc_fits.patch
new file mode 100644
index 000000000000..2ef5545ae04e
--- /dev/null
+++ b/use_local_doc_fits.patch
@@ -0,0 +1,15 @@
+--- a/docs/interpolation.rst 2018-07-02 21:32:42.390297000 +0800
++++ 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, 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')
++ 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