diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | doc-use-local-fits.patch | 76 |
3 files changed, 86 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = python-reproject pkgdesc = Python-based Astronomical image reprojection - pkgver = 0.9 + pkgver = 0.10.0 pkgrel = 1 url = http://reproject.readthedocs.io arch = i686 @@ -13,7 +13,7 @@ pkgbase = python-reproject checkdepends = python-sunpy checkdepends = python-gwcs checkdepends = python-shapely - makedepends = cython + makedepends = cython>=0.29.32 makedepends = python-setuptools-scm makedepends = python-extension-helpers makedepends = python-wheel @@ -23,8 +23,8 @@ pkgbase = python-reproject makedepends = python-astropy-healpix makedepends = python-scipy makedepends = python-pyvo - source = https://files.pythonhosted.org/packages/source/r/reproject/reproject-0.9.tar.gz - md5sums = 7ca84f61b5185e58c8dced85bae84356 + source = https://files.pythonhosted.org/packages/source/r/reproject/reproject-0.10.0.tar.gz + md5sums = 97919e12687f55063c1fd47c9be9e965 pkgname = python-reproject depends = python>=3.8 @@ -3,13 +3,13 @@ pkgbase=python-reproject _pyname=${pkgbase#python-} pkgname=("python-${_pyname}" "python-${_pyname}-doc") -pkgver=0.9 +pkgver=0.10.0 pkgrel=1 pkgdesc="Python-based Astronomical image reprojection" arch=('i686' 'x86_64') url="http://reproject.readthedocs.io" license=('BSD') -makedepends=('cython' +makedepends=('cython>=0.29.32' 'python-setuptools-scm' 'python-extension-helpers' 'python-wheel' @@ -28,7 +28,7 @@ checkdepends=('python-pytest-arraydiff' 'python-gwcs' 'python-shapely') # astropy-healpix scipy already in makedep source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") -md5sums=('7ca84f61b5185e58c8dced85bae84356') +md5sums=('97919e12687f55063c1fd47c9be9e965') get_pyver() { python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))" @@ -39,6 +39,7 @@ prepare() { sed -i -e "/cython/s/==/>=/" -e "/oldest-supported-numpy/d" pyproject.toml # sed -i "/NaNs/a \ ignore:Subclassing validator classes is not intended:DeprecationWarning" setup.cfg +# patch -Np1 -i "${srcdir}/doc-use-local-fits.patch" } build() { @@ -46,14 +47,13 @@ build() { python -m build --wheel --no-isolation msg "Building Docs" - cd ${srcdir}/${_pyname}-${pkgver}/docs - PYTHONPATH="../build/lib.linux-${CARCH}-cpython-$(get_pyver)" make html + PYTHONPATH="../build/lib.linux-${CARCH}-cpython-$(get_pyver)" make -C docs html } check() { cd ${srcdir}/${_pyname}-${pkgver} - pytest "build/lib.linux-${CARCH}-cpython-$(get_pyver)" || warning "Tests failed" + pytest "build/lib.linux-${CARCH}-cpython-$(get_pyver)" || warning "Tests failed" # -vv --color=yes } package_python-reproject() { diff --git a/doc-use-local-fits.patch b/doc-use-local-fits.patch new file mode 100644 index 000000000000..02aa95c75999 --- /dev/null +++ b/doc-use-local-fits.patch @@ -0,0 +1,76 @@ +--- a/docs/footprints.rst 2020-05-30 03:28:31.000000000 +0800 ++++ b/docs/footprints.rst 2021-01-17 01:55:19.596425404 +0800 +@@ -24,8 +24,11 @@ + + from astropy.io import fits + from astropy.utils.data import get_pkg_data_filename +- hdu1 = fits.open(get_pkg_data_filename('galactic_center/gc_2mass_k.fits'))[0] +- hdu2 = fits.open(get_pkg_data_filename('galactic_center/gc_msx_e.fits'))[0] ++ # use local fits if no network ++ try: hdu1 = fits.open(get_pkg_data_filename('galactic_center/gc_2mass_k.fits'))[0] ++ except Exception: hdu1 = fits.open('gc_2mass_k.fits')[0] ++ try: hdu2 = fits.open(get_pkg_data_filename('galactic_center/gc_msx_e.fits'))[0] ++ except Exception: hdu2 = fits.open('gc_msx_e.fits')[0] + + As before, we now reproject the MSX image to be in the same projection as the + 2MASS image, but we do this with two algorithms: +--- a/docs/healpix.rst 2020-05-30 03:28:31.000000000 +0800 ++++ b/docs/healpix.rst 2021-01-17 01:55:19.596425404 +0800 +@@ -37,7 +37,8 @@ + :context: + + from astropy.utils.data import get_pkg_data_filename +- filename_ligo = get_pkg_data_filename('allsky/ligo_simulated.fits.gz') ++ try: filename_ligo = get_pkg_data_filename('allsky/ligo_simulated.fits.gz') ++ except Exception: filename_ligo = 'ligo_simulated.fits.gz' # use local fits if no network + + We can then read in this dataset using Astropy (note that we access HDU 1 + because HEALPIX data is stored as a binary table which cannot be in HDU 0): +--- a/docs/index.rst 2020-05-30 03:28:31.000000000 +0800 ++++ b/docs/index.rst 2021-01-17 01:55:19.596425404 +0800 +@@ -41,8 +41,11 @@ + + from astropy.io import fits + from astropy.utils.data import get_pkg_data_filename +- hdu1 = fits.open(get_pkg_data_filename('galactic_center/gc_2mass_k.fits'))[0] +- hdu2 = fits.open(get_pkg_data_filename('galactic_center/gc_msx_e.fits'))[0] ++ # use local fits if no network ++ try: hdu1 = fits.open(get_pkg_data_filename('galactic_center/gc_2mass_k.fits'))[0] ++ except Exception: hdu1 = fits.open('gc_2mass_k.fits')[0] ++ try: hdu2 = fits.open(get_pkg_data_filename('galactic_center/gc_msx_e.fits'))[0] ++ except Exception: hdu2 = fits.open('gc_msx_e.fits')[0] + + We can examine the two images (this makes use of the + `wcsaxes <wcsaxes.readthedocs.io>`_ package behind the scenes): +--- a/docs/mosaicking.rst 2021-01-17 01:41:40.106416626 +0800 ++++ b/docs/mosaicking.rst 2021-01-17 01:57:35.216426859 +0800 +@@ -258,15 +258,23 @@ + from astropy.coordinates import SkyCoord + from pyvo.dal import imagesearch + +- pos = SkyCoord.from_name('M17') +- table = imagesearch('https://irsa.ipac.caltech.edu/cgi-bin/2MASS/IM/nph-im_sia?type=at&ds=asky&', +- pos, size=0.25).to_table() +- table = table[(table['band'] == 'K') & (table['format'] == 'image/fits')] +- m17_hdus = [fits.open(row['download'])[0] for row in table] ++ try: ++ pos = SkyCoord.from_name('M17') ++ table = imagesearch('https://irsa.ipac.caltech.edu/cgi-bin/2MASS/IM/nph-im_sia?type=at&ds=asky&', ++ pos, size=0.25).to_table() ++ table = table[(table['band'] == 'K') & (table['format'] == 'image/fits')] ++ m17_hdus = [fits.open(row['download'])[0] for row in table] ++ except Exception: ++ # if no network ++ from glob import glob ++ pos = SkyCoord(275.19583333, -16.17166667, unit="deg") ++ table = sorted(glob('ki*.fits'), key=lambda lab: int(lab[3: -5])) ++ m17_hdus = [fits.open(row) for row in table] + + from astropy.coordinates import SkyCoord + from reproject.mosaicking import find_optimal_celestial_wcs +- coord = SkyCoord.from_name('M17') ++ try: coord = SkyCoord.from_name('M17') ++ except Exception: coord = SkyCoord(275.19583333, -16.17166667, unit="deg") # if no network + wcs_out, shape_out = find_optimal_celestial_wcs(m17_hdus, + reference=coord) + |